diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2008-01-01 12:27:58 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-01-12 17:41:04 -0500 |
commit | ab7a9831763f0c10ad137352431eca9a6d97f76e (patch) | |
tree | e06e4d541104e95fc86e60b7b134b843d6b3c8ec /drivers/net/Kconfig | |
parent | 2d2c54e3d058a9be78c04f429fa5e090eb454daa (diff) |
ip1000: menu location change
Move the ip1000 driver into the expected place for gigabit cards
in the configuration menu structure. It should be under the gigabit
cards, not at the top level.
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d9107e542dfa..114771a2a133 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -166,16 +166,6 @@ config NET_SB1000 | |||
166 | 166 | ||
167 | If you don't have this card, of course say N. | 167 | If you don't have this card, of course say N. |
168 | 168 | ||
169 | config IP1000 | ||
170 | tristate "IP1000 Gigabit Ethernet support" | ||
171 | depends on PCI && EXPERIMENTAL | ||
172 | select MII | ||
173 | ---help--- | ||
174 | This driver supports IP1000 gigabit Ethernet cards. | ||
175 | |||
176 | To compile this driver as a module, choose M here: the module | ||
177 | will be called ipg. This is recommended. | ||
178 | |||
179 | source "drivers/net/arcnet/Kconfig" | 169 | source "drivers/net/arcnet/Kconfig" |
180 | 170 | ||
181 | source "drivers/net/phy/Kconfig" | 171 | source "drivers/net/phy/Kconfig" |
@@ -1992,6 +1982,16 @@ config E1000E | |||
1992 | To compile this driver as a module, choose M here. The module | 1982 | To compile this driver as a module, choose M here. The module |
1993 | will be called e1000e. | 1983 | will be called e1000e. |
1994 | 1984 | ||
1985 | config IP1000 | ||
1986 | tristate "IP1000 Gigabit Ethernet support" | ||
1987 | depends on PCI && EXPERIMENTAL | ||
1988 | select MII | ||
1989 | ---help--- | ||
1990 | This driver supports IP1000 gigabit Ethernet cards. | ||
1991 | |||
1992 | To compile this driver as a module, choose M here: the module | ||
1993 | will be called ipg. This is recommended. | ||
1994 | |||
1995 | source "drivers/net/ixp2000/Kconfig" | 1995 | source "drivers/net/ixp2000/Kconfig" |
1996 | 1996 | ||
1997 | config MYRI_SBUS | 1997 | config MYRI_SBUS |