diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 16:04:01 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 16:04:01 +0400 |
| commit | c9d6329c35869ebf2ff88a5831e8073d3365e8bd (patch) | |
| tree | 735df8ad43f404ca031dd2cf2040d74538958b47 /arch/arm/mach-u300/Makefile | |
| parent | 4e7e2a2008f5d8c49791c412849d5b0232d39bb3 (diff) | |
| parent | ad7761ab3adc03fbf2cca8e3c84344175d876c40 (diff) | |
| download | linux-c9d6329c35869ebf2ff88a5831e8073d3365e8bd.tar.xz | |
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 'arch/arm/mach-u300/Makefile')
| -rw-r--r-- | arch/arm/mach-u300/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile index 8fd354aaf0a7..285538124e5e 100644 --- a/arch/arm/mach-u300/Makefile +++ b/arch/arm/mach-u300/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel, U300 machine. # -obj-y := core.o clock.o timer.o padmux.o +obj-y := core.o clock.o timer.o obj-m := obj-n := obj- := |