4 files changed, 6 insertions, 6 deletions

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
-        bool "CSR SiRFprimaII pinmux driver"
+config PINCTRL_SIRF
+        bool "CSR SiRFprimaII pin controller driver"
         depends on ARCH_PRIMA2
         select PINMUX
 
-config PINMUX_U300
-        bool "U300 pinmux driver"
+config PINCTRL_U300
+        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_PINMUX_U300)       += pinmux-u300.o
+obj-$(CONFIG_PINCTRL_SIRF)      += pinctrl-sirf.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