Merge branch 'linus' into x86/gart

[linux-2.6-omap-h63xx.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 25716193a534db2d4fb16c00cca5b1a94c481c6a..ae96bd6242f2fef6638339fb8d74f36d85e3fa1a 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -15,6 +15,29 @@ config MFD_SM501
          interface. The device may be connected by PCI or local bus with
          varying functions enabled.
 
+config MFD_ASIC3
+       bool "Support for Compaq ASIC3"
+       depends on GENERIC_HARDIRQS && ARM
+        ---help---
+         This driver supports the ASIC3 multifunction chip found on many
+         PDAs (mainly iPAQ and HTC based ones)
+
+config HTC_EGPIO
+       bool "HTC EGPIO support"
+       depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
+       help
+           This driver supports the CPLD egpio chip present on
+           several HTC phones.  It provides basic support for input
+           pins, output pins, and irqs.
+
+config HTC_PASIC3
+       tristate "HTC PASIC3 LED/DS1WM chip support"
+       help
+         This core driver provides register access for the LED/DS1WM
+         chips labeled "AIC2" and "AIC3", found on HTC Blueangel and
+         HTC Magician devices, respectively. Actual functionality is
+         handled by the leds-pasic3 and ds1wm drivers.
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"