summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/ppc64_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-02-27 22:04:40 +0100
committerGrant Likely <grant.likely@secretlab.ca>2012-02-27 22:04:40 +0100
commit29f141fed01a09050207c4d41fc5811520d81146 (patch)
treec55a51dca4a0e4da9fdc2b904eefbde37d2a5b03 /arch/powerpc/configs/ppc64_defconfig
parentdt: add empty of_find_compatible_node function (diff)
parentdoc: dt: Fix broken reference in gpio-leds documentation (diff)
downloadlinux-29f141fed01a09050207c4d41fc5811520d81146.tar.xz
linux-29f141fed01a09050207c4d41fc5811520d81146.zip
Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
-rw-r--r--arch/powerpc/configs/ppc64_defconfig5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 2156e077859b..1acf65026773 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -24,10 +24,6 @@ CONFIG_PPC_SPLPAR=y
CONFIG_SCANLOG=m
CONFIG_PPC_SMLPAR=y
CONFIG_DTL=y
-CONFIG_PPC_ISERIES=y
-CONFIG_VIODASD=y
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
CONFIG_PPC_MAPLE=y
CONFIG_PPC_PASEMI=y
CONFIG_PPC_PASEMI_IOMMU=y
@@ -259,7 +255,6 @@ CONFIG_PASEMI_MAC=y
CONFIG_MLX4_EN=m
CONFIG_QLGE=m
CONFIG_BE2NET=m
-CONFIG_ISERIES_VETH=m
CONFIG_PPP=m
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m