Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 550f29744812fe15c748f5c04670df0fcf11492b..a20a51efe11896416e2ca4f7bdee82f4e047a592 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2,7 +2,23 @@
 # Multifunction miscellaneous devices
 #
 
+menu "Multifunction device drivers"
+       depends on HAS_IOMEM
+
+config MFD_SM501
+       tristate "Support for Silicon Motion SM501"
+        ---help---
+         This is the core driver for the Silicon Motion SM501 multimedia
+         companion chip. This device is a multifunction device which may
+         provide numerous interfaces including USB host controller USB gadget,
+         Asyncronous Serial ports, Audio functions and a dual display video
+         interface. The device may be connected by PCI or local bus with
+         varying functions enabled.
+
+endmenu
+
 menu "Multimedia Capabilities Port drivers"
+       depends on ARCH_SA1100
 
 config MCP
        tristate