diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
commit | d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch) | |
tree | 250be7a5a29069f7d1f4524fa45ab0e988833025 /arch/avr32/boards/mimc200/setup.c | |
parent | 490dea45d00f01847ebebd007685d564aaf2cd98 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'arch/avr32/boards/mimc200/setup.c')
-rw-r--r-- | arch/avr32/boards/mimc200/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c index 397cbb8f44c..2b58d61f0af 100644 --- a/arch/avr32/boards/mimc200/setup.c +++ b/arch/avr32/boards/mimc200/setup.c @@ -24,7 +24,7 @@ extern struct atmel_lcdfb_info mimc200_lcdc_data; #include <video/atmel_lcdc.h> #include <linux/fb.h> -#include <asm/atmel-mci.h> +#include <linux/atmel-mci.h> #include <linux/io.h> #include <asm/setup.h> @@ -207,8 +207,6 @@ static int __init mimc200_init(void) * reserve any pins for it. */ - at32_add_system_devices(); - at32_add_device_usart(0); at32_add_device_usart(1); at32_add_device_usart(2); |