summaryrefslogtreecommitdiff
path: root/include/linux/platform_data/gpio-omap.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:06:24 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:06:24 +0100
commit9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch)
treed8c434ea98ee541ee17f4df87bb8e9020ce29b98 /include/linux/platform_data/gpio-omap.h
parent49ea7fc094162fcaa83f5876b2090c816cc4498c (diff)
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff)
downloadolio-linux-3.10-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.xz
olio-linux-3.10-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'include/linux/platform_data/gpio-omap.h')
-rw-r--r--include/linux/platform_data/gpio-omap.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h
index e8741c2678d..5d50b25a73d 100644
--- a/include/linux/platform_data/gpio-omap.h
+++ b/include/linux/platform_data/gpio-omap.h
@@ -26,7 +26,6 @@
#include <linux/io.h>
#include <linux/platform_device.h>
-#include <mach/irqs.h>
#define OMAP1_MPUIO_BASE 0xfffb5000