diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/net/Kconfig | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6b1eb43d063e..65afda4a62d9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2614,6 +2614,8 @@ source "drivers/net/tokenring/Kconfig" | |||
| 2614 | 2614 | ||
| 2615 | source "drivers/net/wireless/Kconfig" | 2615 | source "drivers/net/wireless/Kconfig" |
| 2616 | 2616 | ||
| 2617 | source "drivers/net/wimax/Kconfig" | ||
| 2618 | |||
| 2617 | source "drivers/net/usb/Kconfig" | 2619 | source "drivers/net/usb/Kconfig" |
| 2618 | 2620 | ||
| 2619 | source "drivers/net/pcmcia/Kconfig" | 2621 | source "drivers/net/pcmcia/Kconfig" |