include/asm-arm/arch-omap/gpioexpander.h

   1 /*
   2  * linux/include/asm-arm/arch-omap/gpioexpander.h
   3  *
   4  *
   5  * Copyright (C) 2004 Texas Instruments, Inc.
   6  *
   7  * This package is free software; you can redistribute it and/or modify
   8  * it under the terms of the GNU General Public License version 2 as
   9  * published by the Free Software Foundation.
  10  *
  11  * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  12  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  13  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  14  */
  15
  16 #ifndef __ASM_ARCH_OMAP_GPIOEXPANDER_H
  17 #define __ASM_ARCH_OMAP_GPIOEXPANDER_H
  18
  19 /* Function Prototypes for GPIO Expander functions */
  20
  21 <<<<<<< HEAD:include/asm-arm/arch-omap/gpioexpander.h
  22 =======
  23 #ifdef CONFIG_GPIOEXPANDER_OMAP
  24 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-arm/arch-omap/gpioexpander.h
  25 int read_gpio_expa(u8 *, int);
  26 int write_gpio_expa(u8 , int);
  27 <<<<<<< HEAD:include/asm-arm/arch-omap/gpioexpander.h
  28 =======
  29 #else
  30 static inline int read_gpio_expa(u8 *val, int addr)
  31 {
  32         return 0;
  33 }
  34 static inline int write_gpio_expa(u8 val, int addr)
  35 {
  36         return 0;
  37 }
  38 #endif
  39 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-arm/arch-omap/gpioexpander.h
  40
  41 #endif /* __ASM_ARCH_OMAP_GPIOEXPANDER_H */