diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /include/asm-powerpc/xmon.h | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'include/asm-powerpc/xmon.h')
| -rw-r--r-- | include/asm-powerpc/xmon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/xmon.h b/include/asm-powerpc/xmon.h index f1d337ed68d5..88320a05f0a8 100644 --- a/include/asm-powerpc/xmon.h +++ b/include/asm-powerpc/xmon.h | |||
| @@ -14,8 +14,10 @@ | |||
| 14 | 14 | ||
| 15 | #ifdef CONFIG_XMON | 15 | #ifdef CONFIG_XMON |
| 16 | extern void xmon_setup(void); | 16 | extern void xmon_setup(void); |
| 17 | extern void xmon_register_spus(struct list_head *list); | ||
| 17 | #else | 18 | #else |
| 18 | static inline void xmon_setup(void) { }; | 19 | static inline void xmon_setup(void) { }; |
| 20 | static inline void xmon_register_spus(struct list_head *list) { }; | ||
| 19 | #endif | 21 | #endif |
| 20 | 22 | ||
| 21 | #endif /* __KERNEL __ */ | 23 | #endif /* __KERNEL __ */ |