diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 18:16:28 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 18:16:28 +0100 |
commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/mach-s3c6410/mach-ncp.c | |
parent | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff) | |
parent | baa28e3530375e0bef2c53243634a1c78f5c02f3 (diff) |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c6410/mach-ncp.c')
-rw-r--r-- | arch/arm/mach-s3c6410/mach-ncp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6410/mach-ncp.c b/arch/arm/mach-s3c6410/mach-ncp.c index 6030636f854..55e9bbfaf68 100644 --- a/arch/arm/mach-s3c6410/mach-ncp.c +++ b/arch/arm/mach-s3c6410/mach-ncp.c @@ -79,7 +79,7 @@ static struct platform_device *ncp_devices[] __initdata = { &s3c_device_i2c0, }; -struct map_desc ncp_iodesc[] = {}; +static struct map_desc ncp_iodesc[] __initdata = {}; static void __init ncp_map_io(void) { |