diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:18:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:18:32 -0700 |
| commit | 84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b (patch) | |
| tree | 3272373e763d8e3ba5f7d7b0a7e18cd16eb178a8 /arch/avr32/boards/merisc/setup.c | |
| parent | 5c55b40b27bc3249358dcfc86c0845be409ab7a6 (diff) | |
| parent | bb6e647051a59dca5a72b3deef1e061d7c1c34da (diff) | |
| download | kernel-common-84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b.tar.gz kernel-common-84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b.tar.bz2 kernel-common-84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b.zip | |
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: Fix oops on unaligned user access
avr32: Add support for Mediama RMTx add-on board for ATNGW100
avr32: Change Atmel ATNGW100 config to add choice of add-on board
Fix MIMC200 board LCD init
avr32: Fix clash in ATMEL_USART_ flags
avr32: remove obsolete hw_interrupt_type
avr32: Solves problem with inverted MCI detect pin on Merisc board
atmel-mci: Add support for inverted detect pin
Diffstat (limited to 'arch/avr32/boards/merisc/setup.c')
| -rw-r--r-- | arch/avr32/boards/merisc/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c index 20b300cf105a..623b077594fc 100644 --- a/arch/avr32/boards/merisc/setup.c +++ b/arch/avr32/boards/merisc/setup.c @@ -94,9 +94,10 @@ static struct spi_board_info __initdata spi0_board_info[] = { static struct mci_platform_data __initdata mci0_data = { .slot[0] = { - .bus_width = 4, - .detect_pin = GPIO_PIN_PE(19), - .wp_pin = GPIO_PIN_PE(20), + .bus_width = 4, + .detect_pin = GPIO_PIN_PE(19), + .wp_pin = GPIO_PIN_PE(20), + .detect_is_active_high = true, }, }; |