diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 11:53:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 11:53:05 -0400 |
| commit | 28c3cfd5fb998bd3683bebeebbba38baa2101cad (patch) | |
| tree | 3d325023e6dc56baa6c69fc59dd55bf37ef7967e /arch/arm/mach-s3c2440/mach-osiris.c | |
| parent | 04197c83b3e05546d1003cfa3ff43f1639c0057f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/tracehook
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index d2ee0cd148c6..8b83f93b6102 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
| @@ -341,7 +341,7 @@ static struct platform_device *osiris_devices[] __initdata = { | |||
| 341 | &osiris_pcmcia, | 341 | &osiris_pcmcia, |
| 342 | }; | 342 | }; |
| 343 | 343 | ||
| 344 | static struct clk *osiris_clocks[] = { | 344 | static struct clk *osiris_clocks[] __initdata = { |
| 345 | &s3c24xx_dclk0, | 345 | &s3c24xx_dclk0, |
| 346 | &s3c24xx_dclk1, | 346 | &s3c24xx_dclk1, |
| 347 | &s3c24xx_clkout0, | 347 | &s3c24xx_clkout0, |