diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
| commit | 8b53b57576292b92b27769f9e213df19b6e57786 (patch) | |
| tree | cd851ce4fa71b2653f120d7f11a9c6cbcf311b19 /arch/arm/mach-s3c2440/mach-anubis.c | |
| parent | ab7e79243746e2a9c5f00243e60108189c44c9eb (diff) | |
| parent | 38cc1c3df77c1bb739a4766788eb9fa49f16ffdf (diff) | |
Merge branch 'x86/urgent' into x86/pat
Conflicts:
arch/x86/mm/pageattr.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-anubis.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 265c77dec9d7..441f4bc09472 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -414,7 +414,7 @@ static struct platform_device *anubis_devices[] __initdata = { | |||
| 414 | &anubis_device_sm501, | 414 | &anubis_device_sm501, |
| 415 | }; | 415 | }; |
| 416 | 416 | ||
| 417 | static struct clk *anubis_clocks[] = { | 417 | static struct clk *anubis_clocks[] __initdata = { |
| 418 | &s3c24xx_dclk0, | 418 | &s3c24xx_dclk0, |
| 419 | &s3c24xx_dclk1, | 419 | &s3c24xx_dclk1, |
| 420 | &s3c24xx_clkout0, | 420 | &s3c24xx_clkout0, |