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-mx2 | |
| parent | 1946d6ef9d7bd4ba97094fe6eb68a9b877bde6b7 (diff) | |
| parent | 6b4bfb87b638a4f114dfb6f72f4ac1be88a4ebe4 (diff) | |
| download | kernel_samsung_tuna-947ca2e983c7f46b49dbfb5bf51d39941d39f000.zip kernel_samsung_tuna-947ca2e983c7f46b49dbfb5bf51d39941d39f000.tar.gz kernel_samsung_tuna-947ca2e983c7f46b49dbfb5bf51d39941d39f000.tar.bz2 | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx2')
| -rw-r--r-- | arch/arm/mach-mx2/clock_imx21.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx2/clock_imx27.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c index 999d013..e4b08ca 100644 --- a/arch/arm/mach-mx2/clock_imx21.c +++ b/arch/arm/mach-mx2/clock_imx21.c @@ -890,7 +890,7 @@ static struct clk clko_clk = { .con_id = n, \ .clk = &c, \ }, -static struct clk_lookup lookups[] __initdata = { +static struct clk_lookup lookups[] = { /* It's unlikely that any driver wants one of them directly: _REGISTER_CLOCK(NULL, "ckih", ckih_clk) _REGISTER_CLOCK(NULL, "ckil", ckil_clk) diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index 3f7280c..2c97144 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c @@ -621,7 +621,7 @@ DEFINE_CLOCK1(csi_clk, 0, 0, 0, parent, &csi_clk1, &per4_clk); .clk = &c, \ }, -static struct clk_lookup lookups[] __initdata = { +static struct clk_lookup lookups[] = { _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) |