diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-12 10:29:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-12 10:29:08 -0400 |
| commit | 3c29970c02829a91ab337abea2860973b291bd48 (patch) | |
| tree | 5dfc1606a26479250ab46f045a478e1a66a247cd /include | |
| parent | 59b1c82500bb5d658891bc8e8a2308b76d58a4de (diff) | |
| parent | 0d4b6b901c3d41beb0e1620316aee0aa234edf7f (diff) | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h index 0593cb889d45..70ebd333c55b 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 | |||
| 178 | 178 | ||
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | extern inline void * xchg_ptr(void * m, void * val) | 181 | static inline void * xchg_ptr(void * m, void * val) |
| 182 | { | 182 | { |
| 183 | return (void *) xchg_u32(m, (unsigned long) val); | 183 | return (void *) xchg_u32(m, (unsigned long) val); |
| 184 | } | 184 | } |