summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:34:31 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:34:31 -0700
commit2321fbd2b87539edc1fbfc2e186528a1ef93835f (patch)
treecd7d22794eb262b040b6c2f99f9a46d0293935f2 /arch/arm/Kconfig
parent3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (diff)
parent323cdfc191b7c1597dc748175062c368568d6af4 (diff)
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c65c6eb9810..e85097bceff 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -752,6 +752,8 @@ source "drivers/hwmon/Kconfig"
source "drivers/misc/Kconfig"
+source "drivers/mfd/Kconfig"
+
source "drivers/media/Kconfig"
source "drivers/video/Kconfig"