git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-omap
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/plat-omap/include/mach/gpio.h
b/arch/arm/plat-omap/include/mach/gpio.h
index 2b22a8799bc63eec4ff05266afca49ec8ed6b737..633ff688b928ddf3f68f779473351941ddcbea2d 100644
(file)
--- a/
arch/arm/plat-omap/include/mach/gpio.h
+++ b/
arch/arm/plat-omap/include/mach/gpio.h
@@
-29,7
+29,7
@@
#include <linux/io.h>
#include <mach/irqs.h>
-#define OMAP
_MPUIO_BASE
0xfffb5000
+#define OMAP
1_MPUIO_BASE
0xfffb5000
#if (defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850))