diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
| commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
| tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/mach-omap2/clock34xx.c | |
| parent | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (diff) | |
| parent | f17f9726c27c3921e00a5750e85070e6dd7e1ff7 (diff) | |
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 6febd5f11e85..287abc480924 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include "clock.h" | 26 | #include "clock.h" |
| 27 | #include "clock34xx.h" | 27 | #include "clock34xx.h" |
| 28 | #include "cm.h" | 28 | #include "cm2xxx_3xxx.h" |
| 29 | #include "cm-regbits-34xx.h" | 29 | #include "cm-regbits-34xx.h" |
| 30 | 30 | ||
| 31 | /** | 31 | /** |