diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-16 03:08:07 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-16 03:08:07 +0200 |
commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /arch/arm/mach-integrator | |
parent | NFSv4: kill off complicated macro 'PROC' (diff) | |
parent | Linux 2.6.30 (diff) | |
download | linux-7eef4091a653c243a87e5375c54504cc03bec4d8.tar.xz linux-7eef4091a653c243a87e5375c54504cc03bec4d8.zip |
Merge commit 'v2.6.30' into for-2.6.31
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 6f8872913073..a0f60e55da6a 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -121,7 +121,7 @@ static struct clk uartclk = { .rate = 14745600, }; -static struct clk_lookup lookups[] __initdata = { +static struct clk_lookup lookups[] = { { /* UART0 */ .dev_id = "mb:16", .clk = &uartclk, |