Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / arm / mach-omap2 / omap_hwmod_2430_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index f14b894ce761da60c9c5666c242890d16449191f..6c8fa70ddaddad333545bb10a9e5d5bfe4204950 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -16,7 +16,6 @@
 #include <linux/i2c-omap.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
-
 #include <linux/omap-dma.h>
 #include <plat/dmtimer.h>