On Tue, Apr 03, 2012 at 09:53:56PM -0600, Stephen Warren wrote: > From: Stephen Warren <swarren@xxxxxxxxxx> > > pinctrl/devicetree.c won't compile when !CONFIG_PINCTRL, since the > pinctrl headers don't declare some types when !PINCTRL. Make sure > pinctrl/Makefile only attempts to compile devicetree.c when OF && > PINCTRL. > > Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx> > --- Acked-by: Dong Aisheng <dong.aisheng@xxxxxxxxxx> Regards Dong Aisheng > drivers/pinctrl/Makefile | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile > index 049c9fb..8e3c95a 100644 > --- a/drivers/pinctrl/Makefile > +++ b/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 > -- > 1.7.5.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
