From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 2 May 2012 15:20:03 +0000 (+0200)
Subject: Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=87c35c56f4beed9e43bd41427643215655a31c3d;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'ux500-u9540-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-stericsson into next/newsoc

From: Linus Walleij <linus.walleij@linaro.org>:
  Core support for the U9540 after finalized review

* 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (2 commits)
  ARM: ux500: ioremap differences for DB9540
  ARM: ux500: core U9540 support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

87c35c56f4beed9e43bd41427643215655a31c3d
diff --cc arch/arm/mach-at91/at91rm9200_devices.c
index d9f0d770978e,05774e5b1cba..99affb5d0563
--- 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