diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
| commit | 79dbf9d1a443fc015e05dbeb5ab610059c6d9bf1 (patch) | |
| tree | 044b23d8cb4827763dc0728dbaa76c4cd0eb7ac2 /arch/avr32/configs | |
| parent | de507154419bcaf3c135b94ba3bbb3f3a6464447 (diff) | |
| parent | c554f06fc801004f3fc3b162c490d8fdf4e79725 (diff) | |
Merge branch 'tracking-linux-3.9.y' into merge-linux-linaro-core-trackingllct-20130508.0
Diffstat (limited to 'arch/avr32/configs')
| -rw-r--r-- | arch/avr32/configs/favr-32_defconfig | 1 | ||||
| -rw-r--r-- | arch/avr32/configs/merisc_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index 0421498d666b..97918204f795 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_defconfig @@ -122,7 +122,6 @@ CONFIG_USB_G_SERIAL=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y -CONFIG_MMC_ATMELMCI_DMA=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_ATMEL_PWM=m diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig index 3befab966827..65de4431108c 100644 --- a/arch/avr32/configs/merisc_defconfig +++ b/arch/avr32/configs/merisc_defconfig @@ -102,7 +102,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y -CONFIG_MMC_ATMELMCI_DMA=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_ATMEL_PWM=y |