diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 07:42:03 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 07:42:03 +0900 |
| commit | 47143b094d4700842e42b0a7cc2548d7ae292690 (patch) | |
| tree | ab1e7fb7cdedd29c8a9b953e58110ff3870946e4 /drivers/net/Kconfig | |
| parent | 0b9466ccea3c4ec363737288dd9467bf978c9c2d (diff) | |
| parent | f02cbbe657939489347cbda598401a56913ffcbd (diff) | |
Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
pci root complex: support for tile architecture
drivers/net/tile/: on-chip network drivers for the tile architecture
MAINTAINERS: add drivers/char/hvc_tile.c as maintained by tile
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f6668cdaac8..43db398437b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2945,6 +2945,18 @@ 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 |