diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-16 23:12:26 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-16 23:13:04 -0400 |
commit | f4936639bc4a75218b5598ff69c52b9a8dd7f23d (patch) | |
tree | 9c08fc81cb3d3e658ca7f8dc20a949496d9e6130 /arch/arm/mach-omap2/board-ti8168evm.c | |
parent | d1226e8f98f130918265fb5b4dddcb60b783eb34 (diff) | |
parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) |
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/board-ti8168evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ti8168evm.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c index d4c8392cadb6..c4f8833b4c3c 100644 --- a/arch/arm/mach-omap2/board-ti8168evm.c +++ b/arch/arm/mach-omap2/board-ti8168evm.c | |||
@@ -15,13 +15,10 @@ | |||
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | 17 | ||
18 | #include <mach/hardware.h> | ||
19 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
20 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
21 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
22 | 21 | ||
23 | #include <plat/irqs.h> | ||
24 | #include <plat/board.h> | ||
25 | #include "common.h" | 22 | #include "common.h" |
26 | #include <plat/usb.h> | 23 | #include <plat/usb.h> |
27 | 24 | ||
@@ -32,15 +29,10 @@ static struct omap_musb_board_data musb_board_data = { | |||
32 | .power = 500, | 29 | .power = 500, |
33 | }; | 30 | }; |
34 | 31 | ||
35 | static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = { | ||
36 | }; | ||
37 | |||
38 | static void __init ti81xx_evm_init(void) | 32 | static void __init ti81xx_evm_init(void) |
39 | { | 33 | { |
40 | omap_serial_init(); | 34 | omap_serial_init(); |
41 | omap_sdrc_init(NULL, NULL); | 35 | omap_sdrc_init(NULL, NULL); |
42 | omap_board_config = ti81xx_evm_config; | ||
43 | omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config); | ||
44 | usb_musb_init(&musb_board_data); | 36 | usb_musb_init(&musb_board_data); |
45 | } | 37 | } |
46 | 38 | ||