From: Tony Lindgren <tony@atomide.com>
Date: Fri, 3 Oct 2008 10:02:44 +0000 (+0300)
Subject: Cosmetic fixes to sync up with mainline merges
X-Git-Tag: v2.6.27-omap1~98
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=580ad591d45d1c14e73f9c911558f78ba44f7cb7;p=linux-2.6-omap-h63xx.git

Cosmetic fixes to sync up with mainline merges

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

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 98bdaf29f54..093150c97c0 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -286,7 +286,8 @@ static void __init omap3beagle_flash_init(void)
 static void __init omap3_beagle_init(void)
 {
 	omap3_beagle_i2c_init();
-	platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
+	platform_add_devices(omap3_beagle_devices,
+			ARRAY_SIZE(omap3_beagle_devices));
 	omap_board_config = omap3_beagle_config;
 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
 	omap_serial_init();
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index a490f15f7f7..cfa542a6140 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -225,7 +225,8 @@ static void __init overo_init(void)
 		udelay(10);
 		gpio_set_value(OVERO_GPIO_W2W_NRESET, 1);
 	} else {
-		printk(KERN_ERR "could not obtain gpio for OVERO_GPIO_W2W_NRESET\n");
+		printk(KERN_ERR "could not obtain gpio for "
+					"OVERO_GPIO_W2W_NRESET\n");
 	}
 
 	if ((gpio_request(OVERO_GPIO_BT_NRESET, "OVERO_GPIO_BT_NRESET") == 0) &&
@@ -235,21 +236,24 @@ static void __init overo_init(void)
 		mdelay(6);
 		gpio_set_value(OVERO_GPIO_BT_NRESET, 1);
 	} else {
-		printk(KERN_ERR "could not obtain gpio for OVERO_GPIO_BT_NRESET\n");
+		printk(KERN_ERR "could not obtain gpio for "
+					"OVERO_GPIO_BT_NRESET\n");
 	}
 
 	if ((gpio_request(OVERO_GPIO_USBH_CPEN, "OVERO_GPIO_USBH_CPEN") == 0) &&
 	    (gpio_direction_output(OVERO_GPIO_USBH_CPEN, 1) == 0))
 		gpio_export(OVERO_GPIO_USBH_CPEN, 0);
 	else
-		printk(KERN_ERR "could not obtain gpio for OVERO_GPIO_USBH_CPEN\n");
+		printk(KERN_ERR "could not obtain gpio for "
+					"OVERO_GPIO_USBH_CPEN\n");
 
 	if ((gpio_request(OVERO_GPIO_USBH_NRESET,
 			  "OVERO_GPIO_USBH_NRESET") == 0) &&
 	    (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))
 		gpio_export(OVERO_GPIO_USBH_NRESET, 0);
 	else
-		printk(KERN_ERR "could not obtain gpio for OVERO_GPIO_USBH_NRESET\n");
+		printk(KERN_ERR "could not obtain gpio for "
+					"OVERO_GPIO_USBH_NRESET\n");
 }
 
 static void __init overo_map_io(void)
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 4ffb4f19d20..598392649cd 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <mach/hardware.h>
 #include <asm/mach/irq.h>
-#include <linux/irq.h>
 #include <linux/io.h>
 
 /* selected INTC register offsets */
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 1ad179d7d73..c22bd5feae3 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -94,7 +94,7 @@ static inline void omap_init_dsp(void) { }
 
 static void omap_init_kp(void)
 {
-	/* REVISIT: 2430 keypad is on TWL4030 */
+	/* 2430 and 34xx keypad is on TWL4030 */
 	if (cpu_is_omap2430() || cpu_is_omap34xx())
 		return;