diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 18:20:21 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 18:20:21 -0500 |
| commit | 0180a7d012e413a956e3f46fcbeb8dbf3374a19c (patch) | |
| tree | 4fe9fb3d4410085ed4fc0203da9db25d026844a1 /drivers/mmc | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 948ce6a6a667485e221e92af4a564839af3ba6c5 (diff) | |
Merge branch 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91 into next/drivers
* 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91:
ARM: at91: Add external RTC for Flexibity board
ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board
ARM: at91: add clock selection parameter for at91_add_device_isi()
ARM: at91: Update struct atmel_nand_data to support PMECC
ARM: at91/dma: DMA controller registering with DT support
ARM: at91/dma: remove platform data from DMA controller
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/at91_mci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 947faa5d2ce4..efdb81d21c44 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
| @@ -86,7 +86,6 @@ static inline int at91mci_is_mci1rev2xx(void) | |||
| 86 | { | 86 | { |
| 87 | return ( cpu_is_at91sam9260() | 87 | return ( cpu_is_at91sam9260() |
| 88 | || cpu_is_at91sam9263() | 88 | || cpu_is_at91sam9263() |
| 89 | || cpu_is_at91cap9() | ||
| 90 | || cpu_is_at91sam9rl() | 89 | || cpu_is_at91sam9rl() |
| 91 | || cpu_is_at91sam9g10() | 90 | || cpu_is_at91sam9g10() |
| 92 | || cpu_is_at91sam9g20() | 91 | || cpu_is_at91sam9g20() |