diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-24 04:51:39 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-24 04:51:39 (GMT) |
commit | db404e72bb5432c886ff0ea42e7b31d16be0c837 (patch) | |
tree | 91cf9618fa0b5233115abe6863d2f8a36390c050 /drivers/clk/Makefile | |
parent | 40169a7c399346281da55ed9905a104d3da47945 (diff) | |
parent | e9a91de7602a0a6999f23a2981db68b69aa695a7 (diff) | |
download | linux-db404e72bb5432c886ff0ea42e7b31d16be0c837.tar.xz |
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/clk/Makefile')
-rw-r--r-- | drivers/clk/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 6327536..e48e0da 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_ARCH_MMP) += mmp/ endif obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_ARCH_U8500) += ux500/ +obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o # Chip specific obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o |