diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-24 18:05:45 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 18:05:45 -0400 |
commit | 6d02643d64b4440394ee462ea4b870c8506cd9e7 (patch) | |
tree | e58aba813aa1d040b98355325459ec8ad1c6a4e6 /arch/arm/mach-omap1/clock.c | |
parent | 3d82cbbb3aadb4f8a30e3f614e51be96574a0855 (diff) | |
parent | e8c4a7acc9ec0ee82feedcdc3c6d0ee44d67918a (diff) |
Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/twl-common.c
arch/arm/mach-omap2/usb-host.c
arch/arm/mach-omap2/usb-musb.c
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 9e74aa664acb..931f3f6d396b 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -22,13 +22,11 @@ | |||
22 | 22 | ||
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | 24 | ||
25 | #include "soc.h" | ||
26 | #include <plat/usb.h> | ||
27 | |||
28 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
29 | 26 | ||
30 | #include "../plat-omap/sram.h" | 27 | #include "../plat-omap/sram.h" |
31 | 28 | ||
29 | #include "soc.h" | ||
32 | #include "iomap.h" | 30 | #include "iomap.h" |
33 | #include "clock.h" | 31 | #include "clock.h" |
34 | #include "opp.h" | 32 | #include "opp.h" |