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/ieee1394...
[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
056dc66
..
2b9a1f5
100644
(file)
--- a/
arch/arm/mach-at91/include/mach/gpio.h
+++ b/
arch/arm/mach-at91/include/mach/gpio.h
@@
-214,11
+214,6
@@
extern void at91_gpio_resume(void);
*/
#include <asm/errno.h>
*/
#include <asm/errno.h>
-#include <asm-generic/gpio.h> /* cansleep wrappers */
-
-#define gpio_get_value __gpio_get_value
-#define gpio_set_value __gpio_set_value
-#define gpio_cansleep __gpio_cansleep
#define gpio_to_irq(gpio) (gpio)
#define irq_to_gpio(irq) (irq)
#define gpio_to_irq(gpio) (gpio)
#define irq_to_gpio(irq) (irq)