diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 14:55:53 -0500 |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /arch/powerpc/kernel/udbg.c | |
| parent | 4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff) | |
| parent | 52e4c2a05256cb83cda12f3c2137ab1533344edb (diff) | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'arch/powerpc/kernel/udbg.c')
| -rw-r--r-- | arch/powerpc/kernel/udbg.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c index faa82c1f3f68..57fa2c0a531c 100644 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c | |||
| @@ -67,6 +67,14 @@ void __init udbg_early_init(void) | |||
| 67 | udbg_init_usbgecko(); | 67 | udbg_init_usbgecko(); |
| 68 | #elif defined(CONFIG_PPC_EARLY_DEBUG_WSP) | 68 | #elif defined(CONFIG_PPC_EARLY_DEBUG_WSP) |
| 69 | udbg_init_wsp(); | 69 | udbg_init_wsp(); |
| 70 | #elif defined(CONFIG_PPC_EARLY_DEBUG_EHV_BC) | ||
| 71 | udbg_init_ehv_bc(); | ||
| 72 | #elif defined(CONFIG_PPC_EARLY_DEBUG_PS3GELIC) | ||
| 73 | udbg_init_ps3gelic(); | ||
| 74 | #elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_RAW) | ||
| 75 | udbg_init_debug_opal_raw(); | ||
| 76 | #elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI) | ||
| 77 | udbg_init_debug_opal_hvsi(); | ||
| 70 | #endif | 78 | #endif |
| 71 | 79 | ||
| 72 | #ifdef CONFIG_PPC_EARLY_DEBUG | 80 | #ifdef CONFIG_PPC_EARLY_DEBUG |