diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 13:12:33 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 13:12:33 -0500 |
| commit | e59d969f441fb8e25b30125bdf201153adc5a7e3 (patch) | |
| tree | e18250fbc1bc9e2ca864292d2390325f8ac84c80 /drivers/pinctrl/Makefile | |
| parent | 4ddb1c295752252f61670e35c791bf16e58bbce6 (diff) | |
| parent | f6f94f6660dbe34039e5c86a46c7845589e7ee0c (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'drivers/pinctrl/Makefile')
| -rw-r--r-- | drivers/pinctrl/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 3cb6a0a668a8..f95f5ed923be 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile | |||
| @@ -9,6 +9,7 @@ ifeq ($(CONFIG_OF),y) | |||
| 9 | obj-$(CONFIG_PINCTRL) += devicetree.o | 9 | obj-$(CONFIG_PINCTRL) += devicetree.o |
| 10 | endif | 10 | endif |
| 11 | obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o | 11 | obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o |
| 12 | obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o | ||
| 12 | obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.o | 13 | obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.o |
| 13 | obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o | 14 | obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o |
| 14 | obj-$(CONFIG_PINCTRL_IMX35) += pinctrl-imx35.o | 15 | obj-$(CONFIG_PINCTRL_IMX35) += pinctrl-imx35.o |