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/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/mach-at91/include/mach/gpio.h
b/arch/arm/mach-at91/include/mach/gpio.h
index
6ddc1a6
..
2b9a1f5
100644
(file)
--- a/
arch/arm/mach-at91/include/mach/gpio.h
+++ b/
arch/arm/mach-at91/include/mach/gpio.h
@@
-215,8
+215,6
@@
extern void at91_gpio_resume(void);
#include <asm/errno.h>
-#define __ARM_GPIOLIB_TRIVIAL
-
#define gpio_to_irq(gpio) (gpio)
#define irq_to_gpio(irq) (irq)