diff options
-rw-r--r-- | arch/arm/configs/at91sam9g45_defconfig | 1 | ||||
-rw-r--r-- | arch/avr32/configs/favr-32_defconfig | 1 | ||||
-rw-r--r-- | arch/avr32/configs/merisc_defconfig | 1 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 10 | ||||
-rw-r--r-- | drivers/mmc/host/atmel-mci.c | 2 |
5 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig index 606d48f3b8f8..8aab786863df 100644 --- a/arch/arm/configs/at91sam9g45_defconfig +++ b/arch/arm/configs/at91sam9g45_defconfig | |||
@@ -173,7 +173,6 @@ CONFIG_MMC=y | |||
173 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 173 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
174 | CONFIG_SDIO_UART=m | 174 | CONFIG_SDIO_UART=m |
175 | CONFIG_MMC_ATMELMCI=y | 175 | CONFIG_MMC_ATMELMCI=y |
176 | CONFIG_MMC_ATMELMCI_DMA=y | ||
177 | CONFIG_LEDS_ATMEL_PWM=y | 176 | CONFIG_LEDS_ATMEL_PWM=y |
178 | CONFIG_LEDS_GPIO=y | 177 | CONFIG_LEDS_GPIO=y |
179 | CONFIG_LEDS_TRIGGER_TIMER=y | 178 | CONFIG_LEDS_TRIGGER_TIMER=y |
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 | |||
122 | CONFIG_USB_CDC_COMPOSITE=m | 122 | CONFIG_USB_CDC_COMPOSITE=m |
123 | CONFIG_MMC=y | 123 | CONFIG_MMC=y |
124 | CONFIG_MMC_ATMELMCI=y | 124 | CONFIG_MMC_ATMELMCI=y |
125 | CONFIG_MMC_ATMELMCI_DMA=y | ||
126 | CONFIG_NEW_LEDS=y | 125 | CONFIG_NEW_LEDS=y |
127 | CONFIG_LEDS_CLASS=y | 126 | CONFIG_LEDS_CLASS=y |
128 | CONFIG_LEDS_ATMEL_PWM=m | 127 | 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 | |||
102 | CONFIG_LOGO=y | 102 | CONFIG_LOGO=y |
103 | CONFIG_MMC=y | 103 | CONFIG_MMC=y |
104 | CONFIG_MMC_ATMELMCI=y | 104 | CONFIG_MMC_ATMELMCI=y |
105 | CONFIG_MMC_ATMELMCI_DMA=y | ||
106 | CONFIG_NEW_LEDS=y | 105 | CONFIG_NEW_LEDS=y |
107 | CONFIG_LEDS_CLASS=y | 106 | CONFIG_LEDS_CLASS=y |
108 | CONFIG_LEDS_ATMEL_PWM=y | 107 | CONFIG_LEDS_ATMEL_PWM=y |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d88219e1d86e..9c581c2ed349 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -300,16 +300,6 @@ config MMC_ATMELMCI | |||
300 | 300 | ||
301 | If unsure, say N. | 301 | If unsure, say N. |
302 | 302 | ||
303 | config MMC_ATMELMCI_DMA | ||
304 | bool "Atmel MCI DMA support" | ||
305 | depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE | ||
306 | help | ||
307 | Say Y here to have the Atmel MCI driver use a DMA engine to | ||
308 | do data transfers and thus increase the throughput and | ||
309 | reduce the CPU utilization. | ||
310 | |||
311 | If unsure, say N. | ||
312 | |||
313 | config MMC_MSM | 303 | config MMC_MSM |
314 | tristate "Qualcomm SDCC Controller Support" | 304 | tristate "Qualcomm SDCC Controller Support" |
315 | depends on MMC && ARCH_MSM | 305 | depends on MMC && ARCH_MSM |
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 722af1de7967..10f8b7358e57 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
@@ -2487,10 +2487,8 @@ static int __exit atmci_remove(struct platform_device *pdev) | |||
2487 | atmci_readl(host, ATMCI_SR); | 2487 | atmci_readl(host, ATMCI_SR); |
2488 | clk_disable(host->mck); | 2488 | clk_disable(host->mck); |
2489 | 2489 | ||
2490 | #ifdef CONFIG_MMC_ATMELMCI_DMA | ||
2491 | if (host->dma.chan) | 2490 | if (host->dma.chan) |
2492 | dma_release_channel(host->dma.chan); | 2491 | dma_release_channel(host->dma.chan); |
2493 | #endif | ||
2494 | 2492 | ||
2495 | free_irq(platform_get_irq(pdev, 0), host); | 2493 | free_irq(platform_get_irq(pdev, 0), host); |
2496 | iounmap(host->regs); | 2494 | iounmap(host->regs); |