Skip to content

Commit cdd80bd

Browse files
author
Jeff Kirsher
committed
tile: Move the Tilera driver
Move the Tilera driver into drivers/net/ethernet/tile and make the necessary Kconfig and Makefile changes. Updated the Kconfig so that the options defualt to y if TILE kernel. CC: Chris Metcalf <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 59ffb30 commit cdd80bd

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6411,7 +6411,7 @@ W: http://www.tilera.com/scm/
64116411
S: Supported
64126412
F: arch/tile/
64136413
F: drivers/tty/hvc/hvc_tile.c
6414-
F: drivers/net/tile/
6414+
F: drivers/net/ethernet/tile/
64156415
F: drivers/edac/tile_edac.c
64166416

64176417
TLAN NETWORK DRIVER

drivers/net/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -328,18 +328,6 @@ source "drivers/s390/net/Kconfig"
328328

329329
source "drivers/net/caif/Kconfig"
330330

331-
config TILE_NET
332-
tristate "Tilera GBE/XGBE network driver support"
333-
depends on TILE
334-
default y
335-
select CRC32
336-
help
337-
This is a standard Linux network device driver for the
338-
on-chip Tilera Gigabit Ethernet and XAUI interfaces.
339-
340-
To compile this driver as a module, choose M here: the module
341-
will be called tile_net.
342-
343331
config XEN_NETDEV_FRONTEND
344332
tristate "Xen network device frontend driver"
345333
depends on XEN

drivers/net/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,3 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
7979

8080
obj-$(CONFIG_WIMAX) += wimax/
8181
obj-$(CONFIG_CAIF) += caif/
82-
83-
obj-$(CONFIG_TILE_NET) += tile/

drivers/net/ethernet/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ source "drivers/net/ethernet/stmicro/Kconfig"
156156
source "drivers/net/ethernet/sun/Kconfig"
157157
source "drivers/net/ethernet/tehuti/Kconfig"
158158
source "drivers/net/ethernet/ti/Kconfig"
159+
source "drivers/net/ethernet/tile/Kconfig"
159160
source "drivers/net/ethernet/toshiba/Kconfig"
160161
source "drivers/net/ethernet/tundra/Kconfig"
161162
source "drivers/net/ethernet/via/Kconfig"

drivers/net/ethernet/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
6565
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
6666
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
6767
obj-$(CONFIG_NET_VENDOR_TI) += ti/
68+
obj-$(CONFIG_TILE_NET) += tile/
6869
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
6970
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
7071
obj-$(CONFIG_NET_VENDOR_VIA) += via/

drivers/net/ethernet/tile/Kconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#
2+
# Tilera network device configuration
3+
#
4+
5+
config TILE_NET
6+
tristate "Tilera GBE/XGBE network driver support"
7+
depends on TILE
8+
default y
9+
select CRC32
10+
---help---
11+
This is a standard Linux network device driver for the
12+
on-chip Tilera Gigabit Ethernet and XAUI interfaces.
13+
14+
To compile this driver as a module, choose M here: the module
15+
will be called tile_net.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)