diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 10:03:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 10:03:00 -0700 |
| commit | 7a82323da3d21ea59a0509569fc5c7bc5aa7eed7 (patch) | |
| tree | e1831a744561fed3a0316162d702d58fea9c85e9 /arch/avr32/boards/atstk1000/atstk1003.c | |
| parent | b0d8aa081bcb2d396a257ae5b3be8c1b3006bfa4 (diff) | |
| parent | 3c26e17032e42cfbe606882288223ad6146e4c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: some mmc/sd cleanups
include/video/atmel_lcdc.h must #include <linux/workqueue.h>
avr32: allow system timer to share interrupt to make OProfile work
drivers/misc/atmel-ssc.c: Removed duplicated include
avr32: Add platform data for AC97C platform device
avr32: clean up mci platform code
fix avr32 build errors
Diffstat (limited to 'arch/avr32/boards/atstk1000/atstk1003.c')
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1003.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c index ea109f435a83..591fc73b554a 100644 --- a/arch/avr32/boards/atstk1000/atstk1003.c +++ b/arch/avr32/boards/atstk1000/atstk1003.c @@ -154,7 +154,7 @@ static int __init atstk1003_init(void) at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM - at32_add_device_mci(0); + at32_add_device_mci(0, NULL); #endif at32_add_device_usba(0, NULL); #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM |