Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 81abd89..fae5141 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1018,12 +1018,6 @@ config GPIO_MAX732X_IRQ
          Say yes here to enable the max732x to be used as an interrupt
          controller. It requires the driver to be built in the kernel.
 
-config GPIO_MC9S08DZ60
-       bool "MX35 3DS BOARD MC9S08DZ60 GPIO functions"
-       depends on I2C=y && MACH_MX35_3DS
-       help
-         Select this to enable the MC9S08DZ60 GPIO driver
-
 config GPIO_PCA953X
        tristate "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports"
        select REGMAP_I2C
@@ -1677,6 +1671,15 @@ config GPIO_MOCKUP
          tools/testing/selftests/gpio/gpio-mockup.sh. Reference the usage in
          it.
 
+config GPIO_VIRTIO
+       tristate "VirtIO GPIO support"
+       depends on VIRTIO
+       help
+         Say Y here to enable guest support for virtio-based GPIO controllers.
+
+         These virtual GPIOs can be routed to real GPIOs or attached to
+         simulators on the host (like QEMU).
+
 endmenu
 
 endif