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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
include
/
asm-arm
/
arch-omap
/
gpio.h
diff --git
a/include/asm-arm/arch-omap/gpio.h
b/include/asm-arm/arch-omap/gpio.h
index
74cb2b9
..
1b38857
100644
(file)
--- a/
include/asm-arm/arch-omap/gpio.h
+++ b/
include/asm-arm/arch-omap/gpio.h
@@
-67,7
+67,7
@@
#define OMAP_GPIO_IRQ(nr) (OMAP_GPIO_IS_MPUIO(nr) ? \
IH_MPUIO_BASE + ((nr) & 0x0f) : \
- IH_GPIO_BASE + (
(nr) & 0x3f
))
+ IH_GPIO_BASE + (
nr
))
extern int omap_gpio_init(void); /* Call from board init only */
extern int omap_request_gpio(int gpio);