diff options
| author | James Morris <jmorris@namei.org> | 2009-06-09 01:27:53 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-09 01:27:53 +0200 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /arch/arm/mach-mx2/clock_imx21.c | |
| parent | integrity: ima audit dentry_open failure (diff) | |
| parent | async: Fix lack of boot-time console due to insufficient synchronization (diff) | |
| download | linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-mx2/clock_imx21.c')
| -rw-r--r-- | arch/arm/mach-mx2/clock_imx21.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c index 999d013e06e3..e4b08ca804ea 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) |