Commit 99e82596 authored by Dave Jones's avatar Dave Jones Committed by Jeff Garzik

Merge SIByte SB1250 net driver from 2.4.x.

parent a866edc8
...@@ -57,6 +57,9 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then ...@@ -57,6 +57,9 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
if [ "$CONFIG_MIPS_AU1000" = "y" ]; then if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
bool ' MIPS AU1000 Ethernet support' CONFIG_MIPS_AU1000_ENET bool ' MIPS AU1000 Ethernet support' CONFIG_MIPS_AU1000_ENET
fi fi
if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
tristate ' SB1250 Ethernet support' CONFIG_NET_SB1250_MAC
fi
if [ "$CONFIG_SGI_IP27" = "y" ]; then if [ "$CONFIG_SGI_IP27" = "y" ]; then
bool ' SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH bool ' SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
fi fi
......
...@@ -134,6 +134,7 @@ obj-$(CONFIG_E2100) += e2100.o 8390.o ...@@ -134,6 +134,7 @@ obj-$(CONFIG_E2100) += e2100.o 8390.o
obj-$(CONFIG_ES3210) += es3210.o 8390.o obj-$(CONFIG_ES3210) += es3210.o 8390.o
obj-$(CONFIG_LNE390) += lne390.o 8390.o obj-$(CONFIG_LNE390) += lne390.o 8390.o
obj-$(CONFIG_NE3210) += ne3210.o 8390.o obj-$(CONFIG_NE3210) += ne3210.o 8390.o
obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
obj-$(CONFIG_PPP) += ppp_generic.o slhc.o obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment