diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 07:48:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 07:48:17 -0400 |
| commit | f648972e017659c741bdd3be6b4aeb2d73672031 (patch) | |
| tree | a71e69aa8bd0259bdf4f5b0361c773eeae36b794 /arch/sh/mm/consistent.c | |
| parent | 8c56250f48347750c82ab18d98d647dcf99ca674 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/locking
Diffstat (limited to 'arch/sh/mm/consistent.c')
| -rw-r--r-- | arch/sh/mm/consistent.c | 6 |
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) | |||
| 101 | } | 101 | } |
| 102 | __setup("memchunk.", memchunk_setup); | 102 | __setup("memchunk.", memchunk_setup); |
| 103 | 103 | ||
| 104 | static void memchunk_cmdline_override(char *name, unsigned long *sizep) | 104 | static void __init memchunk_cmdline_override(char *name, unsigned long *sizep) |
| 105 | { | 105 | { |
| 106 | char *p = boot_command_line; | 106 | char *p = boot_command_line; |
| 107 | int k = strlen(name); | 107 | int k = strlen(name); |
| @@ -118,8 +118,8 @@ static void memchunk_cmdline_override(char *name, unsigned long *sizep) | |||
| 118 | } | 118 | } |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | int platform_resource_setup_memory(struct platform_device *pdev, | 121 | int __init platform_resource_setup_memory(struct platform_device *pdev, |
| 122 | char *name, unsigned long memsize) | 122 | char *name, unsigned long memsize) |
| 123 | { | 123 | { |
| 124 | struct resource *r; | 124 | struct resource *r; |
| 125 | dma_addr_t dma_handle; | 125 | dma_addr_t dma_handle; |