diff --git a/[refs] b/[refs] index c22222492b53..9f329eeb3445 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 700487c158163f14e6ff10de770b565c1c993c69 +refs/heads/master: 222db3e5f21fca563f5f692e000afcc01cb4395c diff --git a/trunk/arch/sh/mm/pg-mmu.c b/trunk/arch/sh/mm/pg-mmu.c index 32351206edd3..e5c5122f4d62 100644 --- a/trunk/arch/sh/mm/pg-mmu.c +++ b/trunk/arch/sh/mm/pg-mmu.c @@ -31,7 +31,7 @@ void __init kmap_coherent_init(void) #endif } -static inline void *kmap_coherent(struct page *page, unsigned long addr) +static void *kmap_coherent(struct page *page, unsigned long addr) { enum fixed_addresses idx; unsigned long vaddr, flags;