merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'

     and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'

1 files changed, 32 insertions, 0 deletions

diff --git a/packages/linux/linux-2.6.18/ngw-fix-usart-initialization.patch b/packages/linux/linux-2.6.18/ngw-fix-usart-initialization.patch
new file mode 100644
index 0000000000..702b9aa240
--- /dev/null
+++ b/packages/linux/linux-2.6.18/ngw-fix-usart-initialization.patch
@@ -0,0 +1,32 @@
+---
+ arch/avr32/boards/atngw/setup.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+Index: linux-2.6.18-avr32/arch/avr32/boards/atngw/setup.c
+===================================================================
+--- linux-2.6.18-avr32.orig/arch/avr32/boards/atngw/setup.c	2006-11-02 14:22:05.000000000 +0100
++++ linux-2.6.18-avr32/arch/avr32/boards/atngw/setup.c	2006-11-02 14:42:53.000000000 +0100
+@@ -50,18 +50,19 @@ static int __init parse_tag_ethernet(str
+ }
+ __tagtable(ATAG_ETHERNET, parse_tag_ethernet);
+ 
++struct platform_device *at32_usart_map[1];
++unsigned int at32_nr_usarts = 1;
++
+ void __init setup_board(void)
+ {
+-	at32_map_usart(1, 0);	/* /dev/ttyS0 */
+-
+-	at32_setup_serial_console(0);
++	at32_usart_map[0] = at32_get_usart(1);
+ }
+ 
+ static int __init atngw_init(void)
+ {
+ 	at32_add_system_devices();
+ 
+-	at32_add_device_usart(0);
++	at32_add_device_usart(1);
+ 
+ 	if (eth_data[0].valid)
+ 		at32_add_device_eth(0, &eth_data[0]);