diff options
author | Paul Mackerras <paulus@samba.org> | 2008-05-12 08:57:51 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-12 08:57:51 -0400 |
commit | 0d4b6b901c3d41beb0e1620316aee0aa234edf7f (patch) | |
tree | 6bf52878511c86cc33b2b95ffba53863fa9c01f0 /include/asm-ppc/system.h | |
parent | 6a8b23086c82d7cc4f424518532c8b10d95715c0 (diff) |
[POWERPC] ppc: More compile fixes
This fixes a few more miscellaneous compile problems with ARCH=ppc.
1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags.
2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition.
3. Include <linux/proc_fs.h> in residual.c for the
definition of create_proc_read_entry.
4. Fix xchg_ptr to be a static inline to eliminate a compiler warning.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/system.h')
-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 0593cb889d4..70ebd333c55 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 | } |