Hi Dave, On Tue, 23 Aug 2011 11:40:11 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > On Mon, 22 Aug 2011 11:30:32 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > Here's what I am applying as a merge fixup to the net tree today so that > > my ppc64_defconfig builds actually build more or less the same set of > > drivers as before this rearrangement. > > And this today: And this: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Tue, 23 Aug 2011 11:35:18 +1000 Subject: [PATCH] sparc: update sparc64_defconfig for net device movement Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- arch/sparc/configs/sparc64_defconfig | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index 3c1e858..5732728 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -37,8 +37,6 @@ CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y @@ -95,17 +93,19 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y CONFIG_MII=m +CONFIG_NET_VENDOR_AMD=y CONFIG_SUNLANCE=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_BNX2=m +CONFIG_TIGON3=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_NET_VENDOR_SUN=y CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m CONFIG_SUNVNET=m -CONFIG_NET_PCI=y -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_TIGON3=m -CONFIG_BNX2=m CONFIG_NIU=m # CONFIG_WLAN is not set CONFIG_PPP=m @@ -126,13 +126,13 @@ CONFIG_INPUT_SPARCSPKR=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_PCIPS2=m CONFIG_SERIO_RAW=m +# CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set CONFIG_SERIAL_SUNSU=y CONFIG_SERIAL_SUNSU_CONSOLE=y CONFIG_SERIAL_SUNSAB=y CONFIG_SERIAL_SUNSAB_CONSOLE=y CONFIG_SERIAL_SUNHV=y -# CONFIG_LEGACY_PTYS is not set CONFIG_FB=y CONFIG_FB_TILEBLITTING=y CONFIG_FB_SBUS=y @@ -206,10 +206,8 @@ CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOCKUP_DETECTOR=y -CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set CONFIG_SCHEDSTATS=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KEYS=y -- 1.7.5.4 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
