diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:06 -0500 |
| commit | 8104a4775ad8a7863af0b898224b15aa708582db (patch) | |
| tree | 71380e4db36e9d91e521d0a98be74981e32a6700 /arch/arm/mach-omap2/clock44xx_data.c | |
| parent | f6bbc1daac964da551130dbf01809d3fbd178b2d (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap2/clock44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index e8cb32fd7f13..de9ec8ddd2ae 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include "cm2_44xx.h" | 34 | #include "cm2_44xx.h" |
| 35 | #include "cm-regbits-44xx.h" | 35 | #include "cm-regbits-44xx.h" |
| 36 | #include "prm44xx.h" | 36 | #include "prm44xx.h" |
| 37 | #include "prm44xx.h" | ||
| 38 | #include "prm-regbits-44xx.h" | 37 | #include "prm-regbits-44xx.h" |
| 39 | #include "control.h" | 38 | #include "control.h" |
| 40 | #include "scrm44xx.h" | 39 | #include "scrm44xx.h" |