diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 20:34:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 20:34:23 -0500 |
| commit | f90203e0cf0d5a8b027d511af318bb3db4758fe2 (patch) | |
| tree | d2d9157331857b4220198e053e30ce3427c5140e /include/asm-powerpc/udbg.h | |
| parent | 33e563c1190c26b6bf61990c505cdcb5cdbba7e4 (diff) | |
| parent | 719c91ccadd3ed26570dbb29d54166914832eee9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (61 commits)
[POWERPC] Use udbg_early_init() on ppc32
[POWERPC] Open Firmware serial port driver
[POWERPC] Move MPIC smp routines into mpic.c
[POWERPC] Cleanup pseries kexec code
[POWERPC] Cleanup pseries smp initialisation code
[POWERPC] Consolidate pseries platform header files into pseries.h
[POWERPC] 85xx: Drop use of SYNC macro in head_fsl_booke.S
[POWERPC] cell: pm_rtas_activat_signals routine cleanup
[POWERPC] cell: PPU Oprofile cleanup patch
[POWERPC] spufs: avoid accessing kernel memory through mmapped /mem node
[POWERPC] spu sched: static timeslicing for SCHED_RR contexts
[POWERPC] spu sched: use DECLARE_BITMAP
[POWERPC] spu sched: forced preemption at execution
[POWERPC] spu sched: update some comments
[POWERPC] spu sched: simplity spu_remove_from_active_list
[POWERPC] spufs: optimize spu_run
[POWERPC] spufs: runqueue simplification
[POWERPC] spufs: move prio to spu_context
[POWERPC] spufs: state_mutex cleanup
[POWERPC] spufs: simplify state_mutex
...
Diffstat (limited to 'include/asm-powerpc/udbg.h')
| -rw-r--r-- | include/asm-powerpc/udbg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/udbg.h b/include/asm-powerpc/udbg.h index 4cbc313aa02a..d03d8557f706 100644 --- a/include/asm-powerpc/udbg.h +++ b/include/asm-powerpc/udbg.h | |||
| @@ -46,6 +46,7 @@ extern void __init udbg_init_iseries(void); | |||
| 46 | extern void __init udbg_init_rtas_panel(void); | 46 | extern void __init udbg_init_rtas_panel(void); |
| 47 | extern void __init udbg_init_rtas_console(void); | 47 | extern void __init udbg_init_rtas_console(void); |
| 48 | extern void __init udbg_init_debug_beat(void); | 48 | extern void __init udbg_init_debug_beat(void); |
| 49 | extern void __init udbg_init_btext(void); | ||
| 49 | 50 | ||
| 50 | #endif /* __KERNEL__ */ | 51 | #endif /* __KERNEL__ */ |
| 51 | #endif /* _ASM_POWERPC_UDBG_H */ | 52 | #endif /* _ASM_POWERPC_UDBG_H */ |