summaryrefslogtreecommitdiffstats
path: root/arch/avr32/configs/merisc_defconfig
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-13 17:11:59 +0100
committerChris Ball <cjb@laptop.org>2013-03-22 12:57:22 -0400
commit91cf54feecf815bec0b6a8d6d9dbd0e219f2f2cc (patch)
tree97bf59680c63526b921a0e069eb4caa1ec04317f /arch/avr32/configs/merisc_defconfig
parent0f6e73d0abde95973354b4921b4d08acf01a8b5c (diff)
downloadop-kernel-dev-91cf54feecf815bec0b6a8d6d9dbd0e219f2f2cc.zip
op-kernel-dev-91cf54feecf815bec0b6a8d6d9dbd0e219f2f2cc.tar.gz
mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload
Fix regression introduced by commit 796211b7953 ("mmc: atmel-mci: add pdc support and runtime capabilities detection") which removed the need for CONFIG_MMC_ATMELMCI_DMA but kept the Kconfig-entry as well as the compile guards around dma_release_channel() in remove(). Consequently, DMA is always enabled (if supported), but the DMA-channel is not released on module unload unless the DMA-config option is selected. Remove the no longer used CONFIG_MMC_ATMELMCI_DMA option completely. Signed-off-by: Johan Hovold <jhovold@gmail.com> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch/avr32/configs/merisc_defconfig')
-rw-r--r--arch/avr32/configs/merisc_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
index 3befab9..65de443 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
OpenPOWER on IntegriCloud