From 6c40a8e5f7081c66cc71875fc117e20f4cb1327c Mon Sep 17 00:00:00 2001 From: Franck Bui-Huu Date: Fri, 11 Aug 2006 17:51:51 +0200 Subject: [PATCH] --- yaml --- r: 36055 b: refs/heads/master c: 8df32c636e785069ba7d223ceb9b72c182902295 h: refs/heads/master i: 36053: 9a1958d14c352b13f87ffb437cf8c21b3323386d 36051: 66d51a819ba6d653ec10ee204c3bbe788d33ced9 36047: e1410dc26ed2e059b2269d2f9b6373025b45428a v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0f232174b84..998f8e6902ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ff7bc4808f25e4dd75c3775dba313ddf35277e1 +refs/heads/master: 8df32c636e785069ba7d223ceb9b72c182902295 diff --git a/trunk/arch/mips/kernel/setup.c b/trunk/arch/mips/kernel/setup.c index 0bdc67116deb..f66af9cc7220 100644 --- a/trunk/arch/mips/kernel/setup.c +++ b/trunk/arch/mips/kernel/setup.c @@ -135,7 +135,7 @@ static void __init print_memory_map(void) } } -static inline void parse_cmdline_early(void) +static void __init parse_cmdline_early(void) { char c = ' ', *to = command_line, *from = saved_command_line; unsigned long start_at, mem_size; @@ -476,7 +476,7 @@ static void __init arch_mem_init(char **cmdline_p) #define MAXMEM HIGHMEM_START #define MAXMEM_PFN PFN_DOWN(MAXMEM) -static inline void resource_init(void) +static void __init resource_init(void) { int i;