From: Paul Mackerras <paulus@samba.org>
Date: Wed, 11 Jul 2007 03:28:26 +0000 (+1000)
Subject: Merge branch 'for-2.6.23' into merge
X-Git-Tag: v2.6.23-rc1~767^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bf22f6fe2d72b4d7e9035be8ceb340414cf490e3;p=linux.git

Merge branch 'for-2.6.23' into merge
---

bf22f6fe2d72b4d7e9035be8ceb340414cf490e3
diff --cc arch/powerpc/configs/ps3_defconfig
index 956d1df61e0f,2c7575816257..d0b43df44426
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@@ -478,7 -484,8 +484,8 @@@ CONFIG_NETDEVICES=
  # CONFIG_NET_ETHERNET is not set
  CONFIG_MII=m
  CONFIG_NETDEV_1000=y
 +CONFIG_NETDEV_10000=y
+ CONFIG_GELIC_NET=y
 -# CONFIG_NETDEV_10000 is not set
  
  #
  # Wireless LAN