Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[can-eth-gw-linux.git] / arch / arm / mach-omap2 / omap_hwmod_33xx_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 656f54deb6d87236cca801b3e0d894b67cb769d8..22433cb2bec08e160b3a038ddba8e390c3107402 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -16,7 +16,7 @@
 
 #include <plat/omap_hwmod.h>
 #include <plat/cpu.h>
-#include <plat/gpio.h>
+#include <linux/platform_data/gpio-omap.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>
 #include <plat/mcspi.h>
@@ -29,9 +29,6 @@
 #include "prm33xx.h"
 #include "prm-regbits-33xx.h"
 
-/* XXX Remove this during the sparseirq conversion */
-#define OMAP_INTC_START                        0
-
 /*
  * IP blocks
  */