diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-03 10:48:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-03 10:48:22 -0700 |
| commit | 17eb3d8fbe4c573426fc99946040305e79c07803 (patch) | |
| tree | 4d25b0c0e7acdd34028dce57a133c16f5a54ba2b /drivers/dma | |
| parent | da241efcd9c3da2af6ba20055c7e158ec725005c (diff) | |
| parent | 765a0cac566c938821ae26efb4aa53b7502ee82c (diff) | |
| download | linux-17eb3d8fbe4c573426fc99946040305e79c07803.tar.gz linux-17eb3d8fbe4c573426fc99946040305e79c07803.tar.bz2 linux-17eb3d8fbe4c573426fc99946040305e79c07803.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Just a bunch of bugfixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: provide emtpy check_pgt_cache() function
s390/uaccess: fix page table walk
s390/3270: fix minor_start issue
s390/uaccess: fix clear_user_pt()
s390/scm_blk: fix error return code in scm_blk_init()
s390/scm_block: fix printk format string
drivers/Kconfig: add several missing GENERIC_HARDIRQS dependencies
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 80b69971cf28..aeaea32bcfda 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -83,6 +83,7 @@ config INTEL_IOP_ADMA config DW_DMAC tristate "Synopsys DesignWare AHB DMA support" + depends on GENERIC_HARDIRQS select DMA_ENGINE default y if CPU_AT32AP7000 help |