diff --git a/[refs] b/[refs]
index 78aa066ce5fc..7049b5e19ec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43699dea1ea21a0d5786317a794cb2ba27a6f4fe
+refs/heads/master: 3bece55aa5356af0171aaa64fd9c4f7601c47f1c
diff --git a/trunk/arch/arm/mach-u300/Kconfig b/trunk/arch/arm/mach-u300/Kconfig
index c2d5c6c08364..54d8f34fdee5 100644
--- a/trunk/arch/arm/mach-u300/Kconfig
+++ b/trunk/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/trunk/drivers/pinctrl/Kconfig b/trunk/drivers/pinctrl/Kconfig
index c63c72102989..afaf88558125 100644
--- a/trunk/drivers/pinctrl/Kconfig
+++ b/trunk/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/trunk/drivers/pinctrl/Makefile b/trunk/drivers/pinctrl/Makefile
index c046f78dd7f7..827601cc68f6 100644
--- a/trunk/drivers/pinctrl/Makefile
+++ b/trunk/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/trunk/drivers/pinctrl/pinmux-sirf.c b/trunk/drivers/pinctrl/pinctrl-sirf.c
similarity index 100%
rename from trunk/drivers/pinctrl/pinmux-sirf.c
rename to trunk/drivers/pinctrl/pinctrl-sirf.c
diff --git a/trunk/drivers/pinctrl/pinmux-u300.c b/trunk/drivers/pinctrl/pinctrl-u300.c
similarity index 100%
rename from trunk/drivers/pinctrl/pinmux-u300.c
rename to trunk/drivers/pinctrl/pinctrl-u300.c