Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / pinctrl / Makefile

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index bdc548a..827601c 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -1,8 +1,10 @@
 # generic pinmux support
 
-ccflags-$(CONFIG_DEBUG_PINMUX) += -DDEBUG
+ccflags-$(CONFIG_DEBUG_PINCTRL)        += -DDEBUG
 
 obj-$(CONFIG_PINCTRL)          += core.o
 obj-$(CONFIG_PINMUX)           += pinmux.o
-obj-$(CONFIG_PINMUX_SIRF)      += pinmux-sirf.o
-obj-$(CONFIG_PINMUX_U300)      += pinmux-u300.o
+obj-$(CONFIG_PINCONF)          += pinconf.o
+obj-$(CONFIG_PINCTRL_SIRF)     += pinctrl-sirf.o
+obj-$(CONFIG_PINCTRL_U300)     += pinctrl-u300.o
+obj-$(CONFIG_PINCTRL_COH901)   += pinctrl-coh901.o