File tree Expand file tree Collapse file tree 8 files changed +18
-15
lines changed Expand file tree Collapse file tree 8 files changed +18
-15
lines changed Original file line number Diff line number Diff line change @@ -6411,7 +6411,7 @@ W: http://www.tilera.com/scm/
6411
6411
S: Supported
6412
6412
F: arch/tile/
6413
6413
F: drivers/tty/hvc/hvc_tile.c
6414
- F: drivers/net/tile/
6414
+ F: drivers/net/ethernet/ tile/
6415
6415
F: drivers/edac/tile_edac.c
6416
6416
6417
6417
TLAN NETWORK DRIVER
Original file line number Diff line number Diff line change @@ -328,18 +328,6 @@ source "drivers/s390/net/Kconfig"
328
328
329
329
source "drivers/net/caif/Kconfig"
330
330
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
-
343
331
config XEN_NETDEV_FRONTEND
344
332
tristate "Xen network device frontend driver"
345
333
depends on XEN
Original file line number Diff line number Diff line change @@ -79,5 +79,3 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
79
79
80
80
obj-$(CONFIG_WIMAX) += wimax/
81
81
obj-$(CONFIG_CAIF) += caif/
82
-
83
- obj-$(CONFIG_TILE_NET) += tile/
Original file line number Diff line number Diff line change @@ -156,6 +156,7 @@ source "drivers/net/ethernet/stmicro/Kconfig"
156
156
source "drivers/net/ethernet/sun/Kconfig"
157
157
source "drivers/net/ethernet/tehuti/Kconfig"
158
158
source "drivers/net/ethernet/ti/Kconfig"
159
+ source "drivers/net/ethernet/tile/Kconfig"
159
160
source "drivers/net/ethernet/toshiba/Kconfig"
160
161
source "drivers/net/ethernet/tundra/Kconfig"
161
162
source "drivers/net/ethernet/via/Kconfig"
Original file line number Diff line number Diff line change @@ -65,6 +65,7 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
65
65
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
66
66
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
67
67
obj-$(CONFIG_NET_VENDOR_TI) += ti/
68
+ obj-$(CONFIG_TILE_NET) += tile/
68
69
obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/
69
70
obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/
70
71
obj-$(CONFIG_NET_VENDOR_VIA) += via/
Original file line number Diff line number Diff line change
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.
You can’t perform that action at this time.
0 commit comments