---

yaml --- r: 303335 b: refs/heads/master c: 1ae4e59 h: refs/heads/master i: 303333: 65f8050 303331: 18c3eb7 303327: 791f2c9 v: v3
git-mirror · May 11, 2012 · f224acf · f224acf
1 parent c0cbb66
commit f224acf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1
+refs/heads/master: 1ae4e59279b185a850ad25da4eb5a771bf36bdcb
diff --git a/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_GPIO_MSM_V1)	+= gpio-msm-v1.o
 obj-$(CONFIG_GPIO_MSM_V2)	+= gpio-msm-v2.o
 obj-$(CONFIG_GPIO_MXC)		+= gpio-mxc.o
 obj-$(CONFIG_GPIO_MXS)		+= gpio-mxs.o
-obj-$(CONFIG_PLAT_NOMADIK)	+= gpio-nomadik.o
 obj-$(CONFIG_ARCH_OMAP)		+= gpio-omap.o
 obj-$(CONFIG_GPIO_PCA953X)	+= gpio-pca953x.o
 obj-$(CONFIG_GPIO_PCF857X)	+= gpio-pcf857x.o

diff --git a/trunk/drivers/pinctrl/Makefile b/trunk/drivers/pinctrl/Makefile
@@ -11,6 +11,7 @@ endif
 obj-$(CONFIG_GENERIC_PINCONF)	+= pinconf-generic.o
 obj-$(CONFIG_PINCTRL_PXA3xx)	+= pinctrl-pxa3xx.o
 obj-$(CONFIG_PINCTRL_MMP2)	+= pinctrl-mmp2.o
+obj-$(CONFIG_PLAT_NOMADIK)	+= pinctrl-nomadik.o
 obj-$(CONFIG_PINCTRL_PXA168)	+= pinctrl-pxa168.o
 obj-$(CONFIG_PINCTRL_PXA910)	+= pinctrl-pxa910.o
 obj-$(CONFIG_PINCTRL_SIRF)	+= pinctrl-sirf.o

diff --git a/trunk/drivers/gpio/gpio-nomadik.c → trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/gpio/gpio-nomadik.c → trunk/drivers/pinctrl/pinctrl-nomadik.c