summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 07:29:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 07:29:08 -0700
commit3c29970c02829a91ab337abea2860973b291bd48 (patch)
tree5dfc1606a26479250ab46f045a478e1a66a247cd /include
parent59b1c82500bb5d658891bc8e8a2308b76d58a4de (diff)
parent0d4b6b901c3d41beb0e1620316aee0aa234edf7f (diff)
downloadop-kernel-dev-3c29970c02829a91ab337abea2860973b291bd48.zip
op-kernel-dev-3c29970c02829a91ab337abea2860973b291bd48.tar.gz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] ppc: More compile fixes [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c [POWERPC] ppc: Use ebony_defconfig for defconfig [POWERPC] Fix default cputable entries for e200 and e500 families
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index 0593cb8..70ebd33 100644
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -178,7 +178,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
}
-extern inline void * xchg_ptr(void * m, void * val)
+static inline void * xchg_ptr(void * m, void * val)
{
return (void *) xchg_u32(m, (unsigned long) val);
}
OpenPOWER on IntegriCloud