aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpio/Kconfig6
-rw-r--r--drivers/gpio/Makefile2
-rw-r--r--drivers/gpio/gpio-intel-mid.c (renamed from drivers/gpio/gpio-langwell.c)0
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index c8b02a585baf..92e258c58638 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -621,12 +621,12 @@ config GPIO_AMD8111
621 621
622 If unsure, say N 622 If unsure, say N
623 623
624config GPIO_LANGWELL 624config GPIO_INTEL_MID
625 bool "Intel Langwell/Penwell GPIO support" 625 bool "Intel Mid GPIO support"
626 depends on PCI && X86 626 depends on PCI && X86
627 select IRQ_DOMAIN 627 select IRQ_DOMAIN
628 help 628 help
629 Say Y here to support Intel Langwell/Penwell GPIO. 629 Say Y here to support Intel Mid GPIO.
630 630
631config GPIO_PCH 631config GPIO_PCH
632 tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO" 632 tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7223/ML7831) GPIO"
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 5c353df1de25..7655a369e2b7 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -34,7 +34,7 @@ obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o
34obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o 34obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
35obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o 35obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
36obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o 36obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
37obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o 37obj-$(CONFIG_GPIO_INTEL_MID) += gpio-intel-mid.o
38obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o 38obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
39obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o 39obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
40obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o 40obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
diff --git a/drivers/gpio/gpio-langwell.c b/drivers/gpio/gpio-intel-mid.c
index bf3b9597abd8..bf3b9597abd8 100644
--- a/drivers/gpio/gpio-langwell.c
+++ b/drivers/gpio/gpio-intel-mid.c