From e421b5a2519e285674c6f8fd87d6e64cc0a7a336 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 10 Mar 2009 13:40:13 -0700
Subject: [PATCH] Fix few checkpatch.pl warnings for upstream patches

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/mmc-twl4030.c | 3 ++-
 arch/arm/mach-omap2/usb-musb.c    | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index f33f38534a1..9831b2bfa9a 100644
--- 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 81b4195cbef..927c2d91a03 100644
--- 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>
 
-- 
2.41.0