diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-24 06:51:39 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-24 06:51:39 +0200 |
commit | db404e72bb5432c886ff0ea42e7b31d16be0c837 (patch) | |
tree | 91cf9618fa0b5233115abe6863d2f8a36390c050 /drivers/gpio/Makefile | |
parent | Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3... (diff) | |
parent | arm: vt8500: Update arch-vt8500 to devicetree support. (diff) | |
download | linux-db404e72bb5432c886ff0ea42e7b31d16be0c837.tar.xz linux-db404e72bb5432c886ff0ea42e7b31d16be0c837.zip |
Merge tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code into next/dt
From Tony Prisk:
Update arch-vt8500 and drivers to device tree and
remove existing non-dt code.
* tag 'vt8500-for-next' of git://git.code.sf.net/p/linuxwmt/code:
arm: vt8500: Update arch-vt8500 to devicetree support.
arm: vt8500: gpio: Devicetree support for arch-vt8500
arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
arm: vt8500: clk: Add Common Clock Framework support
video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
serial: vt8500: Add devicetree support for vt8500-serial
rtc: vt8500: Add devicetree support for vt8500-rtc
arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
Resolved add/change conflict in drivers/clk/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/gpio/Makefile')
-rw-r--r-- | drivers/gpio/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 153caceeb053..a288142ad998 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -69,6 +69,7 @@ obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o obj-$(CONFIG_GPIO_UCB1400) += gpio-ucb1400.o obj-$(CONFIG_GPIO_VR41XX) += gpio-vr41xx.o +obj-$(CONFIG_GPIO_VT8500) += gpio-vt8500.o obj-$(CONFIG_GPIO_VX855) += gpio-vx855.o obj-$(CONFIG_GPIO_WM831X) += gpio-wm831x.o obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350.o |