diff options
| author | Daniel Glockner <dg@emlix.com> | 2009-06-10 15:58:49 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-06-22 05:37:57 -0400 |
| commit | 607c2add0f3b2cc12567f658e9dfdb07df2b106e (patch) | |
| tree | 14031042d7b5beb70ab1190f65ef38c189e1653c | |
| parent | 059cafe6df5d3b078c4b1be42623c62ab32de6fd (diff) | |
xtensa: enable s6gmac in s6105_defconfig
Signed-off-by: Daniel Glockner <dg@emlix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Johannes Weiner <jw@emlix.com>
Cc: Oskar Schirmer <os@emlix.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | arch/xtensa/configs/s6105_defconfig | 49 |
1 files changed, 48 insertions, 1 deletions
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig index 768bee006037..a1eca01f8725 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig | |||
| @@ -263,7 +263,54 @@ CONFIG_HAVE_IDE=y | |||
| 263 | # CONFIG_SCSI_NETLINK is not set | 263 | # CONFIG_SCSI_NETLINK is not set |
| 264 | # CONFIG_ATA is not set | 264 | # CONFIG_ATA is not set |
| 265 | # CONFIG_MD is not set | 265 | # CONFIG_MD is not set |
| 266 | # CONFIG_NETDEVICES is not set | 266 | CONFIG_NETDEVICES=y |
| 267 | # CONFIG_DUMMY is not set | ||
| 268 | # CONFIG_BONDING is not set | ||
| 269 | # CONFIG_MACVLAN is not set | ||
| 270 | # CONFIG_EQUALIZER is not set | ||
| 271 | # CONFIG_TUN is not set | ||
| 272 | # CONFIG_VETH is not set | ||
| 273 | CONFIG_PHYLIB=y | ||
| 274 | |||
| 275 | # | ||
| 276 | # MII PHY device drivers | ||
| 277 | # | ||
| 278 | # CONFIG_MARVELL_PHY is not set | ||
| 279 | # CONFIG_DAVICOM_PHY is not set | ||
| 280 | # CONFIG_QSEMI_PHY is not set | ||
| 281 | # CONFIG_LXT_PHY is not set | ||
| 282 | # CONFIG_CICADA_PHY is not set | ||
| 283 | # CONFIG_VITESSE_PHY is not set | ||
| 284 | CONFIG_SMSC_PHY=y | ||
| 285 | # CONFIG_BROADCOM_PHY is not set | ||
| 286 | # CONFIG_ICPLUS_PHY is not set | ||
| 287 | # CONFIG_REALTEK_PHY is not set | ||
| 288 | # CONFIG_NATIONAL_PHY is not set | ||
| 289 | # CONFIG_STE10XP is not set | ||
| 290 | # CONFIG_LSI_ET1011C_PHY is not set | ||
| 291 | # CONFIG_FIXED_PHY is not set | ||
| 292 | # CONFIG_MDIO_BITBANG is not set | ||
| 293 | # CONFIG_NET_ETHERNET is not set | ||
| 294 | CONFIG_NETDEV_1000=y | ||
| 295 | CONFIG_S6GMAC=y | ||
| 296 | # CONFIG_NETDEV_10000 is not set | ||
| 297 | |||
| 298 | # | ||
| 299 | # Wireless LAN | ||
| 300 | # | ||
| 301 | # CONFIG_WLAN_PRE80211 is not set | ||
| 302 | # CONFIG_WLAN_80211 is not set | ||
| 303 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 304 | |||
| 305 | # | ||
| 306 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
| 307 | # | ||
| 308 | # CONFIG_WAN is not set | ||
| 309 | # CONFIG_PPP is not set | ||
| 310 | # CONFIG_SLIP is not set | ||
| 311 | # CONFIG_NETCONSOLE is not set | ||
| 312 | # CONFIG_NETPOLL is not set | ||
| 313 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 267 | # CONFIG_ISDN is not set | 314 | # CONFIG_ISDN is not set |
| 268 | # CONFIG_PHONE is not set | 315 | # CONFIG_PHONE is not set |
| 269 | 316 | ||
