summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2008-08-27 18:21:29 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-08-28 14:53:08 +0900
commitc773d8af8ebccb723e9843c1e73840b2c5e00572 (patch)
treea6ea72b263f0a6ff3755404b494ee859f4e47dd1 /arch
parent5734493bac88b28d8d7e2f262305fd6e83545ac5 (diff)
downloadlinux-c773d8af8ebccb723e9843c1e73840b2c5e00572.tar.gz
linux-c773d8af8ebccb723e9843c1e73840b2c5e00572.tar.bz2
linux-c773d8af8ebccb723e9843c1e73840b2c5e00572.zip
sh: fix platform_resource_setup_memory() section mismatch
This patch kills a section mismatch for platform_resource_setup_memory(). Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/mm/consistent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index 895bb3f335c7..64b8f7f96f9a 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -101,7 +101,7 @@ static int __init memchunk_setup(char *str)
}
__setup("memchunk.", memchunk_setup);
-static void memchunk_cmdline_override(char *name, unsigned long *sizep)
+static void __init memchunk_cmdline_override(char *name, unsigned long *sizep)
{
char *p = boot_command_line;
int k = strlen(name);
@@ -118,8 +118,8 @@ static void memchunk_cmdline_override(char *name, unsigned long *sizep)
}
}
-int platform_resource_setup_memory(struct platform_device *pdev,
- char *name, unsigned long memsize)
+int __init platform_resource_setup_memory(struct platform_device *pdev,
+ char *name, unsigned long memsize)
{
struct resource *r;
dma_addr_t dma_handle;