diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
| commit | 0d62950125241a6e6db8e8f14271f098ec7a2da4 (patch) | |
| tree | 8cdd9e17f6a6ff4cb6166ad12a4d3ed1d45b2dc9 /arch/avr32/boards/atngw100 | |
| parent | b3bc2c5562f06ca34b30f61c5714e96490946c81 (diff) | |
| parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
Diffstat (limited to 'arch/avr32/boards/atngw100')
| -rw-r--r-- | arch/avr32/boards/atngw100/setup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index abcb0d9559b1..65db3d266965 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c | |||
| @@ -54,8 +54,11 @@ static struct spi_board_info spi0_board_info[] __initdata = { | |||
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | static struct mci_platform_data __initdata mci0_data = { | 56 | static struct mci_platform_data __initdata mci0_data = { |
| 57 | .detect_pin = GPIO_PIN_PC(25), | 57 | .slot[0] = { |
| 58 | .wp_pin = GPIO_PIN_PE(0), | 58 | .bus_width = 4, |
| 59 | .detect_pin = GPIO_PIN_PC(25), | ||
| 60 | .wp_pin = GPIO_PIN_PE(0), | ||
| 61 | }, | ||
| 59 | }; | 62 | }; |
| 60 | 63 | ||
| 61 | /* | 64 | /* |