diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-04 12:27:18 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-04 12:27:18 +0100 |
commit | 947ca2e983c7f46b49dbfb5bf51d39941d39f000 (patch) | |
tree | 4a092e425960c929444d4e93a57c577c7fdb7f8c /arch/arm/mach-mx3/clock.c | |
parent | 1946d6ef9d7bd4ba97094fe6eb68a9b877bde6b7 (diff) | |
parent | 6b4bfb87b638a4f114dfb6f72f4ac1be88a4ebe4 (diff) | |
download | blackbird-op-linux-947ca2e983c7f46b49dbfb5bf51d39941d39f000.tar.gz blackbird-op-linux-947ca2e983c7f46b49dbfb5bf51d39941d39f000.zip |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/clock.c')
-rw-r--r-- | arch/arm/mach-mx3/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index 9957a11533a4..a68fcf981edf 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c @@ -516,7 +516,7 @@ DEFINE_CLOCK(ipg_clk, 0, NULL, 0, ipg_get_rate, NULL, &ahb_clk); .clk = &c, \ }, -static struct clk_lookup lookups[] __initdata = { +static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "emi", emi_clk) _REGISTER_CLOCK(NULL, "cspi", cspi1_clk) _REGISTER_CLOCK(NULL, "cspi", cspi2_clk) |