diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /drivers/net/Kconfig | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
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 a20693fcb321..89be23340ee4 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2954,6 +2954,18 @@ source "drivers/s390/net/Kconfig" | |||
| 2954 | 2954 | ||
| 2955 | source "drivers/net/caif/Kconfig" | 2955 | source "drivers/net/caif/Kconfig" |
| 2956 | 2956 | ||
| 2957 | config TILE_NET | ||
| 2958 | tristate "Tilera GBE/XGBE network driver support" | ||
| 2959 | depends on TILE | ||
| 2960 | default y | ||
| 2961 | select CRC32 | ||
| 2962 | help | ||
| 2963 | This is a standard Linux network device driver for the | ||
| 2964 | on-chip Tilera Gigabit Ethernet and XAUI interfaces. | ||
| 2965 | |||
| 2966 | To compile this driver as a module, choose M here: the module | ||
| 2967 | will be called tile_net. | ||
| 2968 | |||
| 2957 | config XEN_NETDEV_FRONTEND | 2969 | config XEN_NETDEV_FRONTEND |
| 2958 | tristate "Xen network device frontend driver" | 2970 | tristate "Xen network device frontend driver" |
| 2959 | depends on XEN | 2971 | depends on XEN |