diff options
| author |   Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /arch/powerpc/configs/ppc64_defconfig | |
| parent | KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate() (diff) | |
| parent | KVM: x86: Update symbolic exit codes (diff) | |
| download | linux-dev-bf550fc93d9855872a95e69e4002256110d89858.tar.xz linux-dev-bf550fc93d9855872a95e69e4002256110d89858.zip | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index aef3f71de5ad..c86fcb92358e 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -398,6 +398,8 @@ CONFIG_FTR_FIXUP_SELFTEST=y CONFIG_MSI_BITMAP_SELFTEST=y CONFIG_XMON=y CONFIG_BOOTX_TEXT=y +CONFIG_PPC_EARLY_DEBUG=y +CONFIG_PPC_EARLY_DEBUG_BOOTX=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_PCBC=m |