5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index c2d5c6c08364..54d8f34fdee5 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -7,7 +7,7 @@ comment "ST-Ericsson Mobile Platform Products"
 config MACH_U300
        bool "U300"
        select PINCTRL
-        select PINMUX_U300
+        select PINCTRL_U300
        select PINCTRL_COH901
 comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c63c72102989..afaf88558125 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -23,13 +23,13 @@ config DEBUG_PINCTRL
        help
          Say Y here to add some extra checks and diagnostics to PINCTRL calls.
-config PINMUX_SIRF
+config PINCTRL_SIRF
-        bool "CSR SiRFprimaII pinmux driver"
+        bool "CSR SiRFprimaII pin controller driver"
        depends on ARCH_PRIMA2
        select PINMUX
-config PINMUX_U300
+config PINCTRL_U300
-        bool "U300 pinmux driver"
+        bool "U300 pin controller driver"
        depends on ARCH_U300
        select PINMUX
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index c046f78dd7f7..827601cc68f6 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -5,6 +5,6 @@ ccflags-$(CONFIG_DEBUG_PINCTRL)	+= -DDEBUG
 obj-$(CONFIG_PINCTRL)           += core.o
 obj-$(CONFIG_PINMUX)            += pinmux.o
 obj-$(CONFIG_PINCONF)           += pinconf.o
-obj-$(CONFIG_PINMUX_SIRF)       += pinmux-sirf.o
+obj-$(CONFIG_PINCTRL_SIRF)      += pinctrl-sirf.o
-obj-$(CONFIG_PINMUX_U300)       += pinmux-u300.o
+obj-$(CONFIG_PINCTRL_U300)      += pinctrl-u300.o
 obj-$(CONFIG_PINCTRL_COH901)    += pinctrl-coh901.o
diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinctrl-sirf.c
index 99e688e07ea0..99e688e07ea0 100644
--- a/drivers/pinctrl/pinmux-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinctrl-u300.c
index 7e89b367a7e5..7e89b367a7e5 100644
--- a/drivers/pinctrl/pinmux-u300.c
+++ b/drivers/pinctrl/pinctrl-u300.c

diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index c2d5c6c08364..54d8f34fdee5 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig
@@ -7,7 +7,7 @@ comment "ST-Ericsson Mobile Platform Products"
7	config MACH_U300	7	config MACH_U300
8	bool "U300"	8	bool "U300"
9	select PINCTRL	9	select PINCTRL
10	select PINMUX_U300	10	select PINCTRL_U300
11	select PINCTRL_COH901	11	select PINCTRL_COH901
12		12
13	comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"	13	comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"


diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index c63c72102989..afaf88558125 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig
@@ -23,13 +23,13 @@ config DEBUG_PINCTRL
23	help	23	help
24	Say Y here to add some extra checks and diagnostics to PINCTRL calls.	24	Say Y here to add some extra checks and diagnostics to PINCTRL calls.
25		25
26	config PINMUX_SIRF	26	config PINCTRL_SIRF
27	bool "CSR SiRFprimaII pinmux driver"	27	bool "CSR SiRFprimaII pin controller driver"
28	depends on ARCH_PRIMA2	28	depends on ARCH_PRIMA2
29	select PINMUX	29	select PINMUX
30		30
31	config PINMUX_U300	31	config PINCTRL_U300
32	bool "U300 pinmux driver"	32	bool "U300 pin controller driver"
33	depends on ARCH_U300	33	depends on ARCH_U300
34	select PINMUX	34	select PINMUX
35		35


diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index c046f78dd7f7..827601cc68f6 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile
@@ -5,6 +5,6 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG
5	obj-$(CONFIG_PINCTRL) += core.o	5	obj-$(CONFIG_PINCTRL) += core.o
6	obj-$(CONFIG_PINMUX) += pinmux.o	6	obj-$(CONFIG_PINMUX) += pinmux.o
7	obj-$(CONFIG_PINCONF) += pinconf.o	7	obj-$(CONFIG_PINCONF) += pinconf.o
8	obj-$(CONFIG_PINMUX_SIRF) += pinmux-sirf.o	8	obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o
9	obj-$(CONFIG_PINMUX_U300) += pinmux-u300.o	9	obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o
10	obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o	10	obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o


diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinctrl-sirf.c index 99e688e07ea0..99e688e07ea0 100644 --- a/drivers/pinctrl/pinmux-sirf.c +++ b/drivers/pinctrl/pinctrl-sirf.c


diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinctrl-u300.c index 7e89b367a7e5..7e89b367a7e5 100644 --- a/drivers/pinctrl/pinmux-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c