diff options
| author | Andrew Victor | 2006-12-04 09:09:08 +0100 |
|---|---|---|
| committer | Russell King | 2006-12-04 15:37:34 +0100 |
| commit | c019d49b69237f195b1a31d90facf738a371841f (patch) | |
| tree | e9c88aa3d3e031bd7b63e1144d97c810b8280155 /arch/arm/mach-at91rm9200/board-carmeva.c | |
| parent | [ARM] 3966/1: AT91: RM9200 device data update (diff) | |
| download | kernel-qcow2-linux-c019d49b69237f195b1a31d90facf738a371841f.tar.gz kernel-qcow2-linux-c019d49b69237f195b1a31d90facf738a371841f.tar.xz kernel-qcow2-linux-c019d49b69237f195b1a31d90facf738a371841f.zip | |
[ARM] 3972/1: AT91: Update board.h
Replace the 'is_b' variable with 'slot_b' in at91_mmc_data.
Also add the new 'chipselect' variable for CF/PCMCIA and 'bus_width_16'
variable for NAND.
This (and previous patches) will unfortunately break the current MMC,
USB Gadget and PCMCIA drivers. Updates and fixes for those drivers will
be submitted to the various subsystem maintainers.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91rm9200/board-carmeva.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/board-carmeva.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/board-carmeva.c b/arch/arm/mach-at91rm9200/board-carmeva.c index 5cd68e6001ef..654f0379550a 100644 --- a/arch/arm/mach-at91rm9200/board-carmeva.c +++ b/arch/arm/mach-at91rm9200/board-carmeva.c @@ -88,7 +88,7 @@ static struct at91_udc_data __initdata carmeva_udc_data = { // }; static struct at91_mmc_data __initdata carmeva_mmc_data = { - .is_b = 0, + .slot_b = 0, .wire4 = 1, .det_pin = AT91_PIN_PB10, .wp_pin = AT91_PIN_PC14, |