aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-23 03:42:10 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-27 03:58:49 -0400
commit88491d8103498a6166f70d5999902fec70924314 (patch)
treed22646735d94ad81597b535e9e56131cc1896d71 /drivers/net/Makefile
parent330278cde612888e79fc4ab13d8f725258e903dd (diff)
drivers/net: Kconfig & Makefile cleanup
The is does a general cleanup of the drivers/net/ Kconfig and Makefile. This patch create a "core" option and places all the networking core drivers into this option (default is yes for this option). In addition, it alphabitizes the Kconfig driver options. As a side cleanup, found that the arcnet, token ring, and PHY Kconfig options were a tri-state option and should have been a bool option. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile64
1 files changed, 28 insertions, 36 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 99327a4a3f7c..1f52e73547b0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -2,40 +2,38 @@
2# Makefile for the Linux network device drivers. 2# Makefile for the Linux network device drivers.
3# 3#
4 4
5obj-$(CONFIG_MII) += mii.o
6obj-$(CONFIG_MDIO) += mdio.o
7obj-$(CONFIG_PHYLIB) += phy/
8obj-$(CONFIG_CAN) += can/
9obj-$(CONFIG_BONDING) += bonding/
10obj-$(CONFIG_VMXNET3) += vmxnet3/
11
12# 5#
13# link order important here 6# Networking Core Drivers
14# 7#
15obj-$(CONFIG_RIONET) += rionet.o 8obj-$(CONFIG_BONDING) += bonding/
16
17#
18# end link order section
19#
20
21obj-$(CONFIG_NET) += Space.o loopback.o
22obj-$(CONFIG_NET_SB1000) += sb1000.o
23
24obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
25obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
26
27obj-$(CONFIG_DUMMY) += dummy.o 9obj-$(CONFIG_DUMMY) += dummy.o
10obj-$(CONFIG_EQUALIZER) += eql.o
28obj-$(CONFIG_IFB) += ifb.o 11obj-$(CONFIG_IFB) += ifb.o
29obj-$(CONFIG_MACVLAN) += macvlan.o 12obj-$(CONFIG_MACVLAN) += macvlan.o
30obj-$(CONFIG_MACVTAP) += macvtap.o 13obj-$(CONFIG_MACVTAP) += macvtap.o
31obj-$(CONFIG_EQUALIZER) += eql.o 14obj-$(CONFIG_MII) += mii.o
15obj-$(CONFIG_MDIO) += mdio.o
16obj-$(CONFIG_NET) += Space.o loopback.o
17obj-$(CONFIG_NETCONSOLE) += netconsole.o
18obj-$(CONFIG_PHYLIB) += phy/
19obj-$(CONFIG_RIONET) += rionet.o
32obj-$(CONFIG_TUN) += tun.o 20obj-$(CONFIG_TUN) += tun.o
33obj-$(CONFIG_VETH) += veth.o 21obj-$(CONFIG_VETH) += veth.o
22obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
34 23
24#
25# Networking Drivers
26#
27obj-$(CONFIG_ARCNET) += arcnet/
35obj-$(CONFIG_DEV_APPLETALK) += appletalk/ 28obj-$(CONFIG_DEV_APPLETALK) += appletalk/
29obj-$(CONFIG_CAIF) += caif/
30obj-$(CONFIG_CAN) += can/
31obj-$(CONFIG_ETRAX_ETHERNET) += cris/
36obj-$(CONFIG_ETHERNET) += ethernet/ 32obj-$(CONFIG_ETHERNET) += ethernet/
37obj-$(CONFIG_FDDI) += fddi/ 33obj-$(CONFIG_FDDI) += fddi/
38obj-$(CONFIG_HIPPI) += hippi/ 34obj-$(CONFIG_HIPPI) += hippi/
35obj-$(CONFIG_HAMRADIO) += hamradio/
36obj-$(CONFIG_IRDA) += irda/
39obj-$(CONFIG_PLIP) += plip/ 37obj-$(CONFIG_PLIP) += plip/
40onj-$(CONFIG_PPP) += ppp/ 38onj-$(CONFIG_PPP) += ppp/
41obj-$(CONFIG_PPP_ASYNC) += ppp/ 39obj-$(CONFIG_PPP_ASYNC) += ppp/
@@ -48,9 +46,17 @@ obj-$(CONFIG_PPPOL2TP) += ppp/
48obj-$(CONFIG_PPTP) += ppp/ 46obj-$(CONFIG_PPTP) += ppp/
49onj-$(CONFIG_SLIP) += slip/ 47onj-$(CONFIG_SLIP) += slip/
50obj-$(CONFIG_SLHC) += slip/ 48obj-$(CONFIG_SLHC) += slip/
49obj-$(CONFIG_NET_SB1000) += sb1000.o
50onj-$(CONFIG_SLIP) += slip/
51obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
51obj-$(CONFIG_TR) += tokenring/ 52obj-$(CONFIG_TR) += tokenring/
52obj-$(CONFIG_WAN) += wan/ 53obj-$(CONFIG_WAN) += wan/
53obj-$(CONFIG_ARCNET) += arcnet/ 54obj-$(CONFIG_WLAN) += wireless/
55obj-$(CONFIG_WIMAX) += wimax/
56
57obj-$(CONFIG_VMXNET3) += vmxnet3/
58obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
59obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
54 60
55obj-$(CONFIG_USB_CATC) += usb/ 61obj-$(CONFIG_USB_CATC) += usb/
56obj-$(CONFIG_USB_KAWETH) += usb/ 62obj-$(CONFIG_USB_KAWETH) += usb/
@@ -61,17 +67,3 @@ obj-$(CONFIG_USB_USBNET) += usb/
61obj-$(CONFIG_USB_ZD1201) += usb/ 67obj-$(CONFIG_USB_ZD1201) += usb/
62obj-$(CONFIG_USB_IPHETH) += usb/ 68obj-$(CONFIG_USB_IPHETH) += usb/
63obj-$(CONFIG_USB_CDC_PHONET) += usb/ 69obj-$(CONFIG_USB_CDC_PHONET) += usb/
64
65obj-$(CONFIG_WLAN) += wireless/
66obj-$(CONFIG_HAMRADIO) += hamradio/
67obj-$(CONFIG_IRDA) += irda/
68obj-$(CONFIG_ETRAX_ETHERNET) += cris/
69
70obj-$(CONFIG_NETCONSOLE) += netconsole.o
71
72obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
73
74obj-$(CONFIG_WIMAX) += wimax/
75obj-$(CONFIG_CAIF) += caif/
76
77obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o