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 'omap-all' into devel
[pandora-kernel.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
5bb7460
..
98e9008
100644
(file)
--- a/
arch/arm/plat-omap/include/mach/gpio.h
+++ b/
arch/arm/plat-omap/include/mach/gpio.h
@@
-26,8
+26,8
@@
#ifndef __ASM_ARCH_OMAP_GPIO_H
#define __ASM_ARCH_OMAP_GPIO_H
+#include <linux/io.h>
#include <mach/irqs.h>
-#include <asm/io.h>
#define OMAP_MPUIO_BASE 0xfffb5000