summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/include/mach/gpio.h
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-09-22 20:00:11 +0400
committerPaul Walmsley <paul@pwsan.com>2012-09-22 20:00:11 +0400
commit5dbd6535d5bcb9d1899dd27d209ca651431df66b (patch)
tree137231cd0e8e01a30e4946625836d512db6830e7 /arch/arm/mach-omap2/include/mach/gpio.h
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff)
parentde6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff)
downloadlinux-5dbd6535d5bcb9d1899dd27d209ca651431df66b.tar.xz
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for twl-core driver and to fix omap1_defconfig compile when led driver changes and omap sparse IRQ changes are merged together. Also fix warnings for omaps not using pinctrl framework yet.
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/gpio.h')
-rw-r--r--arch/arm/mach-omap2/include/mach/gpio.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/include/mach/gpio.h b/arch/arm/mach-omap2/include/mach/gpio.h
index be4d290d57ee..5621cc59c9f4 100644
--- a/arch/arm/mach-omap2/include/mach/gpio.h
+++ b/arch/arm/mach-omap2/include/mach/gpio.h
@@ -1,5 +1,3 @@
/*
* arch/arm/mach-omap2/include/mach/gpio.h
*/
-
-#include <plat/gpio.h>