Fix few checkpatch.pl warnings for upstream patches

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index f33f38534a1e8f6ae9a4fcef5535681791e1859d..9831b2bfa9aeb8a78d279693db299c76a083aed2 100644 (file)
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -357,7 +357,8 @@ static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vd
        return ret;
 }
 
-static int twl_mmc3_set_power(struct device *dev, int slot, int power_on, int vdd)
+static int twl_mmc3_set_power(struct device *dev, int slot, int power_on,
+               int vdd)
 {
        /*
         * Assume MMC3 has self-powered device connected, for example on-board

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 81b4195cbefbf54107d8006bc654b16d4fedda99..927c2d91a036c15ec7d741bb1d822bc1be8f770b 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -22,8 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <linux/usb/musb.h>