diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-09-19 17:56:54 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-09-19 18:21:29 +0200 |
| commit | 7fb61a7b6f9111245867fa2bce47949f4298d430 (patch) | |
| tree | 3c2e4337afc1a11c71c1f681931112e90c3b6dc1 | |
| parent | warn: Turn the netdev timeout WARN_ON() into a WARN() (diff) | |
| download | linux-7fb61a7b6f9111245867fa2bce47949f4298d430.tar.xz linux-7fb61a7b6f9111245867fa2bce47949f4298d430.zip | |
atstk1000: fix build breakage with BOARD_ATSTK100X_SW2_CUSTOM=y
The #ifdef surrounding the code adding the mmc controller had a typo,
causing it to be compiled even when mmc was supposed to be disabled.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index ee4c292683e1..dfc3443e23aa 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -325,7 +325,7 @@ static int __init atstk1002_init(void) #ifdef CONFIG_BOARD_ATSTK100X_SPI1 at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif -#ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM +#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM at32_add_device_mci(0, MCI_PDATA); #endif #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM |