diff --git a/[refs] b/[refs]
index d026cf68c161..74106ce46173 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57291ce295c0aca738dd284c4a9c591c09ebee71
+refs/heads/master: eafeb7a44aa8f79c992b9d557ede740c739f4b25
diff --git a/trunk/drivers/pinctrl/Makefile b/trunk/drivers/pinctrl/Makefile
index 049c9fb39dab..8e3c95a02fbd 100644
--- a/trunk/drivers/pinctrl/Makefile
+++ b/trunk/drivers/pinctrl/Makefile
@@ -5,7 +5,9 @@ ccflags-$(CONFIG_DEBUG_PINCTRL)	+= -DDEBUG
 obj-$(CONFIG_PINCTRL)		+= core.o
 obj-$(CONFIG_PINMUX)		+= pinmux.o
 obj-$(CONFIG_PINCONF)		+= pinconf.o
-obj-$(CONFIG_OF)		+= devicetree.o
+ifeq ($(CONFIG_OF),y)
+obj-$(CONFIG_PINCTRL)		+= devicetree.o
+endif
 obj-$(CONFIG_GENERIC_PINCONF)	+= pinconf-generic.o
 obj-$(CONFIG_PINCTRL_PXA3xx)	+= pinctrl-pxa3xx.o
 obj-$(CONFIG_PINCTRL_MMP2)	+= pinctrl-mmp2.o