git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/mach-ixp4xx/include/mach/gpio.h
b/arch/arm/mach-ixp4xx/include/mach/gpio.h
index
a5f87de
..
83d6b4e
100644
(file)
--- a/
arch/arm/mach-ixp4xx/include/mach/gpio.h
+++ b/
arch/arm/mach-ixp4xx/include/mach/gpio.h
@@
-28,6
+28,8
@@
#include <linux/kernel.h>
#include <mach/hardware.h>
#include <linux/kernel.h>
#include <mach/hardware.h>
+#define __ARM_GPIOLIB_COMPLEX
+
static inline int gpio_request(unsigned gpio, const char *label)
{
return 0;
static inline int gpio_request(unsigned gpio, const char *label)
{
return 0;
@@
-70,6
+72,7
@@
static inline void gpio_set_value(unsigned gpio, int value)
#include <asm-generic/gpio.h> /* cansleep wrappers */
extern int gpio_to_irq(int gpio);
#include <asm-generic/gpio.h> /* cansleep wrappers */
extern int gpio_to_irq(int gpio);
+#define gpio_to_irq gpio_to_irq
extern int irq_to_gpio(unsigned int irq);
#endif
extern int irq_to_gpio(unsigned int irq);
#endif