diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:23:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:23:58 -0800 |
| commit | f589b86d4b6e067b720a253bdb40896857804037 (patch) | |
| tree | a0eaff20e2d43b424d4c760ff227b4a47f602044 /arch/ppc | |
| parent | c8b1ef88d09961078d3c685fcdc1d1659db05231 (diff) | |
| parent | b80fa3cce7390185e43ea22e9b3c38ab138bc580 (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] Remove xmon from ml300 and ml403 defconfig in arch/ppc
Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/configs/ml300_defconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/configs/ml403_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/configs/ml300_defconfig b/arch/ppc/configs/ml300_defconfig index 69bad91a6b65..d66cacdb95be 100644 --- a/arch/ppc/configs/ml300_defconfig +++ b/arch/ppc/configs/ml300_defconfig @@ -719,7 +719,7 @@ CONFIG_DEBUG_INFO=y CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_KGDB is not set -CONFIG_XMON=y +# CONFIG_XMON is not set # CONFIG_BDI_SWITCH is not set # CONFIG_SERIAL_TEXT_DEBUG is not set diff --git a/arch/ppc/configs/ml403_defconfig b/arch/ppc/configs/ml403_defconfig index a78896ea4560..71bcfa7ab7f7 100644 --- a/arch/ppc/configs/ml403_defconfig +++ b/arch/ppc/configs/ml403_defconfig @@ -720,7 +720,7 @@ CONFIG_DEBUG_INFO=y CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_KGDB is not set -CONFIG_XMON=y +# CONFIG_XMON is not set # CONFIG_BDI_SWITCH is not set # CONFIG_SERIAL_TEXT_DEBUG is not set |