summaryrefslogtreecommitdiffstats
path: root/drivers/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-02 11:08:03 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-02 11:08:03 +0200
commitd04ce5dfe7d2a7502c9a77952164dd6a1e1666a4 (patch)
treee3cc1f97ef08950b42223b7334dffe8a721c9a6e /drivers/Kconfig
parent1510c57e93fdfdc8f5f6f6b2bbce44ac9a313172 (diff)
parent0256d59a41d2ee933fa6e5cc6ee3e933749171e9 (diff)
downloadbarebox-d04ce5dfe7d2a7502c9a77952164dd6a1e1666a4.tar.gz
barebox-d04ce5dfe7d2a7502c9a77952164dd6a1e1666a4.tar.xz
Merge branch 'for-next/mxs-nand'
Conflicts: arch/arm/mach-mxs/Kconfig arch/arm/mach-mxs/Makefile drivers/Makefile
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r--drivers/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 089dc3f99b..883b0e7bc9 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -17,5 +17,6 @@ source "drivers/eeprom/Kconfig"
source "drivers/input/Kconfig"
source "drivers/watchdog/Kconfig"
source "drivers/pwm/Kconfig"
+source "drivers/dma/Kconfig"
endmenu