diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 14:04:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 14:04:01 +0200 |
| commit | c9d6329c35869ebf2ff88a5831e8073d3365e8bd (patch) | |
| tree | 735df8ad43f404ca031dd2cf2040d74538958b47 /drivers/Makefile | |
| parent | 4e7e2a2008f5d8c49791c412849d5b0232d39bb3 (diff) | |
| parent | ad7761ab3adc03fbf2cca8e3c84344175d876c40 (diff) | |
Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl
* 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
pinctrl/sirf: fix sirfsoc_get_group_pins prototype
pinctrl: Don't copy function name when requesting a pin
pinctrl: Don't copy pin names when registering them
pinctrl: Remove unsafe __refdata
pinctrl: get_group_pins() const fixes
pinctrl: add a driver for the CSR SiRFprimaII pinmux
pinctrl: add a driver for the U300 pinmux
drivers: create a pin control subsystem
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 7fa433a7030..e7afb3acbc6 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -5,6 +5,8 @@ # Rewritten to use lists instead of if-statements. # +# GPIO must come after pinctrl as gpios may need to mux pins etc +obj-y += pinctrl/ obj-y += gpio/ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ |