diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2008-10-12 11:08:46 +0200 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-10-12 11:08:46 +0200 |
commit | 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e (patch) | |
tree | cf8f017f44b768445eecb6698c47d479c6b46a01 /arch/avr32/boards/atngw100/setup.c | |
parent | 162350eb75fcb81ec0ea34f042f1deddb759aea8 (diff) | |
parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
Conflicts:
drivers/mmc/host/atmel-mci.c
Diffstat (limited to 'arch/avr32/boards/atngw100/setup.c')
-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 b8286f1ce85..f3085208959 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c @@ -53,8 +53,11 @@ static struct spi_board_info spi0_board_info[] __initdata = { }; static struct mci_platform_data __initdata mci0_data = { - .detect_pin = GPIO_PIN_PC(25), - .wp_pin = GPIO_PIN_PE(0), + .slot[0] = { + .bus_width = 4, + .detect_pin = GPIO_PIN_PC(25), + .wp_pin = GPIO_PIN_PE(0), + }, }; /* |