diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 14:09:32 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 14:09:32 +0100 |
commit | f0af7245f1725fdc39b32b59c20500448437ddbe (patch) | |
tree | d12fd927f546eac8b6c5697bb5c60f9a5e48bece /arch/arm/mach-s3c2440/mach-osiris.c | |
parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
parent | f47c32f3ae604669c3af0b7a07917270a235bd84 (diff) |
Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux
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 d2ee0cd148c..8b83f93b610 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 = { &osiris_pcmcia, }; -static struct clk *osiris_clocks[] = { +static struct clk *osiris_clocks[] __initdata = { &s3c24xx_dclk0, &s3c24xx_dclk1, &s3c24xx_clkout0, |