From: Arnd Bergmann Date: Wed, 2 May 2012 15:07:03 +0000 (+0200) Subject: Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup X-Git-Tag: v3.5-rc1~156^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ced62c33fc434b9d44118c9f35803af8088cc3fe;p=platform%2Fkernel%2Flinux-exynos.git Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup From: Sascha Hauer ARM: i.MX cleanups for 3.5 * tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (5 commits) ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig arm: imx: make various struct sys_timer static Includes an update to 3.4-rc4 Signed-off-by: Arnd Bergmann --- ced62c33fc434b9d44118c9f35803af8088cc3fe diff --cc arch/arm/mach-at91/at91rm9200_devices.c index d9f0d77,05774e5..99affb5 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@@ -1160,10 -1168,13 +1160,9 @@@ void __init at91_add_device_serial(void if (at91_uarts[i]) platform_device_register(at91_uarts[i]); } - - if (!atmel_default_console_device) - printk(KERN_INFO "AT91: No default serial console defined.\n"); } #else - void __init __deprecated at91_init_serial(struct at91_uart_config *config) {} void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {} -void __init at91_set_serial_console(unsigned portnr) {} void __init at91_add_device_serial(void) {} #endif