diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:32:24 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:32:24 -0800 |
| commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
| tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/mach-omap2/clkt2xxx_osc.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/clkt2xxx_osc.c')
| -rw-r--r-- | arch/arm/mach-omap2/clkt2xxx_osc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clkt2xxx_osc.c b/arch/arm/mach-omap2/clkt2xxx_osc.c index 2167be84a5bc..df7b80506483 100644 --- a/arch/arm/mach-omap2/clkt2xxx_osc.c +++ b/arch/arm/mach-omap2/clkt2xxx_osc.c @@ -27,7 +27,7 @@ #include "clock.h" #include "clock2xxx.h" -#include "prm.h" +#include "prm2xxx_3xxx.h" #include "prm-regbits-24xx.h" static int omap2_enable_osc_ck(struct clk *clk) |