diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:06:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:06:59 -0800 |
| commit | 8f9993f76aacfc58083fad04f8e1b6bbea33de23 (patch) | |
| tree | 90d7885b26b87d27ed4cdb4026e608908e8a8a4c /drivers | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 9918ceafd4a9e013572e03983f528017c29bb1cb (diff) | |
Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into next/cleanup
* 'at91-3.4-base' of git://github.com/at91linux/linux-at91:
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/at91_mci.c | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 4 |
2 files changed, 2 insertions, 3 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) { return ( cpu_is_at91sam9260() || cpu_is_at91sam9263() - || cpu_is_at91cap9() || cpu_is_at91sam9rl() || cpu_is_at91sam9g10() || cpu_is_at91sam9g20() diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 7ecb68a67411..85ae4b46bb68 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -137,7 +137,7 @@ choice config USB_AT91 tristate "Atmel AT91 USB Device Port" - depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91CAP9 && !ARCH_AT91SAM9G45 + depends on ARCH_AT91 && !ARCH_AT91SAM9RL && !ARCH_AT91SAM9G45 help Many Atmel AT91 processors (such as the AT91RM2000) have a full speed USB Device Port with support for five configurable @@ -150,7 +150,7 @@ config USB_AT91 config USB_ATMEL_USBA tristate "Atmel USBA" select USB_GADGET_DUALSPEED - depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 + depends on AVR32 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 help USBA is the integrated high-speed USB Device controller on the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel. |