diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-24 03:26:10 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-24 03:26:10 +0400 |
| commit | cd427485357c0c4b99f69719251baacf25946e11 (patch) | |
| tree | ca1ff7eb2277dec42f1e20adc0b98c3c215ecfbe /arch/powerpc/configs | |
| parent | d410ae2126481a74bc5be4a6242c4a232c19a984 (diff) | |
| parent | 48b16180d0d91324e5d2423c6d53d97bbe3dcc14 (diff) | |
| download | linux-cd427485357c0c4b99f69719251baacf25946e11.tar.xz | |
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott. Mostly support for critical
and machine check exceptions on 64-bit BookE, some new
PCI suspend/resume work and misc bits.
Diffstat (limited to 'arch/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index e6c8d203322b..5c7fa19ae4ef 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig @@ -26,7 +26,6 @@ CONFIG_CORENET_GENERIC=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y -CONFIG_FSL_IFC=y CONFIG_PCIEPORTBUS=y CONFIG_PCI_MSI=y CONFIG_RAPIDIO=y diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 9fff2819b038..19f0fbe5ba4b 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig @@ -49,7 +49,6 @@ CONFIG_HIGHMEM=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_FSL_IFC=y CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_RAPIDIO=y diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index c496cd6fe646..062312e1fe1a 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -52,7 +52,6 @@ CONFIG_HIGHMEM=y CONFIG_BINFMT_MISC=m CONFIG_MATH_EMULATION=y CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_FSL_IFC=y CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_RAPIDIO=y |