diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/tile/Kconfig | 15 | ||||
| -rw-r--r-- | drivers/net/ethernet/tile/Makefile (renamed from drivers/net/tile/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/tile/tilepro.c (renamed from drivers/net/tile/tilepro.c) | 0 |
8 files changed, 18 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dfa4269fd4d..3d8a6a6d660 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6411,7 +6411,7 @@ W: http://www.tilera.com/scm/ S: Supported F: arch/tile/ F: drivers/tty/hvc/hvc_tile.c -F: drivers/net/tile/ +F: drivers/net/ethernet/tile/ F: drivers/edac/tile_edac.c TLAN NETWORK DRIVER diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c83a1c0f0d4..3a1fd2c716c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -328,18 +328,6 @@ source "drivers/s390/net/Kconfig" source "drivers/net/caif/Kconfig" -config TILE_NET - tristate "Tilera GBE/XGBE network driver support" - depends on TILE - default y - select CRC32 - help - This is a standard Linux network device driver for the - on-chip Tilera Gigabit Ethernet and XAUI interfaces. - - To compile this driver as a module, choose M here: the module - will be called tile_net. - config XEN_NETDEV_FRONTEND tristate "Xen network device frontend driver" depends on XEN diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 620abd76e0b..fcc62e603a2 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -79,5 +79,3 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o obj-$(CONFIG_WIMAX) += wimax/ obj-$(CONFIG_CAIF) += caif/ - -obj-$(CONFIG_TILE_NET) += tile/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index f011665546d..cff6ef53606 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -156,6 +156,7 @@ source "drivers/net/ethernet/stmicro/Kconfig" source "drivers/net/ethernet/sun/Kconfig" source "drivers/net/ethernet/tehuti/Kconfig" source "drivers/net/ethernet/ti/Kconfig" +source "drivers/net/ethernet/tile/Kconfig" source "drivers/net/ethernet/toshiba/Kconfig" source "drivers/net/ethernet/tundra/Kconfig" source "drivers/net/ethernet/via/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 7f3b73ca428..986def799cf 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -65,6 +65,7 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/ obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ obj-$(CONFIG_NET_VENDOR_TI) += ti/ +obj-$(CONFIG_TILE_NET) += tile/ obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/ obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/ obj-$(CONFIG_NET_VENDOR_VIA) += via/ diff --git a/drivers/net/ethernet/tile/Kconfig b/drivers/net/ethernet/tile/Kconfig new file mode 100644 index 00000000000..2d9218f86bc --- /dev/null +++ b/drivers/net/ethernet/tile/Kconfig @@ -0,0 +1,15 @@ +# +# Tilera network device configuration +# + +config TILE_NET + tristate "Tilera GBE/XGBE network driver support" + depends on TILE + default y + select CRC32 + ---help--- + This is a standard Linux network device driver for the + on-chip Tilera Gigabit Ethernet and XAUI interfaces. + + To compile this driver as a module, choose M here: the module + will be called tile_net. diff --git a/drivers/net/tile/Makefile b/drivers/net/ethernet/tile/Makefile index f634f142cab..f634f142cab 100644 --- a/drivers/net/tile/Makefile +++ b/drivers/net/ethernet/tile/Makefile diff --git a/drivers/net/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index 1e2af96fc29..1e2af96fc29 100644 --- a/drivers/net/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c |