From 580ad591d45d1c14e73f9c911558f78ba44f7cb7 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 3 Oct 2008 13:02:44 +0300 Subject: [PATCH] Cosmetic fixes to sync up with mainline merges Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-omap3beagle.c | 3 ++- arch/arm/mach-omap2/board-overo.c | 12 ++++++++---- arch/arm/mach-omap2/irq.c | 1 - arch/arm/plat-omap/devices.c | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) 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 #include #include -#include #include /* 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; -- 2.41.0