aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2013-09-14 13:43:08 +0200
committerH. Nikolaus Schaller <hns@goldelico.com>2013-09-14 13:43:08 +0200
commitfc342c6b0b0f468a3864d3c8902ed8e31762e866 (patch)
treeb061713ed8052960768b07667e52c0be6e16e674 /drivers/dma
parent1bf07d164fcf5553d98a737b0e0caad208ab51e4 (diff)
parent3711d86a2de17e967b576af8b8a1e9351a7d1466 (diff)
downloadkernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.zip
kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.tar.gz
kernel_goldelico_gta04-fc342c6b0b0f468a3864d3c8902ed8e31762e866.tar.bz2
Merge remote-tracking branch 'linus/master' into 3.12-wip
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/dw/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/dma/dw/Kconfig b/drivers/dma/dw/Kconfig
index dde1324..dcfe964 100644
--- a/drivers/dma/dw/Kconfig
+++ b/drivers/dma/dw/Kconfig
@@ -4,7 +4,6 @@
config DW_DMAC_CORE
tristate "Synopsys DesignWare AHB DMA support"
- depends on GENERIC_HARDIRQS
select DMA_ENGINE
config DW_DMAC