summaryrefslogtreecommitdiffstats
path: root/config-powerpc32-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-26 18:23:52 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-26 21:03:18 -0400
commit34f9218fe519cd922889076cc7698bd73bdb9f92 (patch)
tree50217145a1dd12d404471d7c32f1093ffdc916b7 /config-powerpc32-generic
parent829bffe3f94cfbe50c418900af3d6eb9df27d59e (diff)
downloadkernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.gz
kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.xz
kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.zip
Linux 3.1-git1 (138c4ae9cfda upstream)
First take on the upcomming Linux 3.2 kernel. The moving of the ethernet drivers into vendor subdirectories caused a lot of churn in config-generic, but hopefully it's a bit cleaner now.
Diffstat (limited to 'config-powerpc32-generic')
-rw-r--r--config-powerpc32-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-powerpc32-generic b/config-powerpc32-generic
index 31c399e65..6cf06acab 100644
--- a/config-powerpc32-generic
+++ b/config-powerpc32-generic
@@ -41,6 +41,7 @@ CONFIG_ADB_PMU_LED=y
CONFIG_ADB_PMU_LED_IDE=y
CONFIG_PMAC_MEDIABAY=y
+CONFIG_NET_VENDOR_APPLE=y
CONFIG_BMAC=m
CONFIG_MACE=m
# CONFIG_MACE_AAUI_PORT is not set
@@ -86,6 +87,7 @@ CONFIG_8xxx_WDT=m
CONFIG_GEF_WDT=m
CONFIG_PPC_MPC5200_BUGFIX=y
+CONFIG_NET_VENDOR_FREESCALE=y
CONFIG_FEC_MPC52xx=m
#CHECK: This may later become a tristate.
CONFIG_FEC_MPC52xx_MDIO=y
@@ -185,3 +187,4 @@ CONFIG_KVM_BOOK3S_32=m
# CONFIG_SCSI_QLA_ISCSI is not set
CONFIG_BATTERY_PMU=m
+