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 '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/mach-mxs/include/mach/gpio.h
b/arch/arm/mach-mxs/include/mach/gpio.h
index
828cccc
..
bb11e63
100644
(file)
--- a/
arch/arm/mach-mxs/include/mach/gpio.h
+++ b/
arch/arm/mach-mxs/include/mach/gpio.h
@@
-20,16
+20,8
@@
#ifndef __MACH_MXS_GPIO_H__
#define __MACH_MXS_GPIO_H__
#ifndef __MACH_MXS_GPIO_H__
#define __MACH_MXS_GPIO_H__
-#include <asm-generic/gpio.h>
-
#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
-/* use gpiolib dispatchers */
-#define gpio_get_value __gpio_get_value
-#define gpio_set_value __gpio_set_value
-#define gpio_cansleep __gpio_cansleep
-#define gpio_to_irq __gpio_to_irq
-
#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
#endif /* __MACH_MXS_GPIO_H__ */
#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
#endif /* __MACH_MXS_GPIO_H__ */