diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-26 18:13:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-26 18:13:33 -0400 |
| commit | ecd68853b852cdafb138f9c437f3a751fe7dc381 (patch) | |
| tree | 6b3a3468d0d3dca7f226de7e3551913d907b17a2 /drivers/net | |
| parent | 087377a4307e18225f6452af5e71fe763c088c4e (diff) | |
| parent | 3041a069090224462e27da1bc9483b463eb40841 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: dev.c comment fixes
[IPV6] ROUTE: Don't try less preferred routes for on-link routes.
[IRDA]: *_DONGLE should depend on IRTTY_SIR
[MAINTAINERS]: Add entry for netem
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/irda/Kconfig | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 5e6d00752990..cff8598aa800 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig | |||
| @@ -33,7 +33,7 @@ config DONGLE | |||
| 33 | 33 | ||
| 34 | config ESI_DONGLE | 34 | config ESI_DONGLE |
| 35 | tristate "ESI JetEye PC dongle" | 35 | tristate "ESI JetEye PC dongle" |
| 36 | depends on DONGLE && IRDA | 36 | depends on IRTTY_SIR && DONGLE && IRDA |
| 37 | help | 37 | help |
| 38 | Say Y here if you want to build support for the Extended Systems | 38 | Say Y here if you want to build support for the Extended Systems |
| 39 | JetEye PC dongle. To compile it as a module, choose M here. The ESI | 39 | JetEye PC dongle. To compile it as a module, choose M here. The ESI |
| @@ -44,7 +44,7 @@ config ESI_DONGLE | |||
| 44 | 44 | ||
| 45 | config ACTISYS_DONGLE | 45 | config ACTISYS_DONGLE |
| 46 | tristate "ACTiSYS IR-220L and IR220L+ dongle" | 46 | tristate "ACTiSYS IR-220L and IR220L+ dongle" |
| 47 | depends on DONGLE && IRDA | 47 | depends on IRTTY_SIR && DONGLE && IRDA |
| 48 | help | 48 | help |
| 49 | Say Y here if you want to build support for the ACTiSYS IR-220L and | 49 | Say Y here if you want to build support for the ACTiSYS IR-220L and |
| 50 | IR220L+ dongles. To compile it as a module, choose M here. The | 50 | IR220L+ dongles. To compile it as a module, choose M here. The |
| @@ -55,7 +55,7 @@ config ACTISYS_DONGLE | |||
| 55 | 55 | ||
| 56 | config TEKRAM_DONGLE | 56 | config TEKRAM_DONGLE |
| 57 | tristate "Tekram IrMate 210B dongle" | 57 | tristate "Tekram IrMate 210B dongle" |
| 58 | depends on DONGLE && IRDA | 58 | depends on IRTTY_SIR && DONGLE && IRDA |
| 59 | help | 59 | help |
| 60 | Say Y here if you want to build support for the Tekram IrMate 210B | 60 | Say Y here if you want to build support for the Tekram IrMate 210B |
| 61 | dongle. To compile it as a module, choose M here. The Tekram dongle | 61 | dongle. To compile it as a module, choose M here. The Tekram dongle |
| @@ -66,7 +66,7 @@ config TEKRAM_DONGLE | |||
| 66 | 66 | ||
| 67 | config TOIM3232_DONGLE | 67 | config TOIM3232_DONGLE |
| 68 | tristate "TOIM3232 IrDa dongle" | 68 | tristate "TOIM3232 IrDa dongle" |
| 69 | depends on DONGLE && IRDA | 69 | depends on IRTTY_SIR && DONGLE && IRDA |
| 70 | help | 70 | help |
| 71 | Say Y here if you want to build support for the Vishay/Temic | 71 | Say Y here if you want to build support for the Vishay/Temic |
| 72 | TOIM3232 and TOIM4232 based dongles. | 72 | TOIM3232 and TOIM4232 based dongles. |
| @@ -74,7 +74,7 @@ config TOIM3232_DONGLE | |||
| 74 | 74 | ||
| 75 | config LITELINK_DONGLE | 75 | config LITELINK_DONGLE |
| 76 | tristate "Parallax LiteLink dongle" | 76 | tristate "Parallax LiteLink dongle" |
| 77 | depends on DONGLE && IRDA | 77 | depends on IRTTY_SIR && DONGLE && IRDA |
| 78 | help | 78 | help |
| 79 | Say Y here if you want to build support for the Parallax Litelink | 79 | Say Y here if you want to build support for the Parallax Litelink |
| 80 | dongle. To compile it as a module, choose M here. The Parallax | 80 | dongle. To compile it as a module, choose M here. The Parallax |
| @@ -85,7 +85,7 @@ config LITELINK_DONGLE | |||
| 85 | 85 | ||
| 86 | config MA600_DONGLE | 86 | config MA600_DONGLE |
| 87 | tristate "Mobile Action MA600 dongle" | 87 | tristate "Mobile Action MA600 dongle" |
| 88 | depends on DONGLE && IRDA && EXPERIMENTAL | 88 | depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL |
| 89 | help | 89 | help |
| 90 | Say Y here if you want to build support for the Mobile Action MA600 | 90 | Say Y here if you want to build support for the Mobile Action MA600 |
| 91 | dongle. To compile it as a module, choose M here. The MA600 dongle | 91 | dongle. To compile it as a module, choose M here. The MA600 dongle |
| @@ -98,7 +98,7 @@ config MA600_DONGLE | |||
| 98 | 98 | ||
| 99 | config GIRBIL_DONGLE | 99 | config GIRBIL_DONGLE |
| 100 | tristate "Greenwich GIrBIL dongle" | 100 | tristate "Greenwich GIrBIL dongle" |
| 101 | depends on DONGLE && IRDA && EXPERIMENTAL | 101 | depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL |
| 102 | help | 102 | help |
| 103 | Say Y here if you want to build support for the Greenwich GIrBIL | 103 | Say Y here if you want to build support for the Greenwich GIrBIL |
| 104 | dongle. If you want to compile it as a module, choose M here. | 104 | dongle. If you want to compile it as a module, choose M here. |
| @@ -109,7 +109,7 @@ config GIRBIL_DONGLE | |||
| 109 | 109 | ||
| 110 | config MCP2120_DONGLE | 110 | config MCP2120_DONGLE |
| 111 | tristate "Microchip MCP2120" | 111 | tristate "Microchip MCP2120" |
| 112 | depends on DONGLE && IRDA && EXPERIMENTAL | 112 | depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL |
| 113 | help | 113 | help |
| 114 | Say Y here if you want to build support for the Microchip MCP2120 | 114 | Say Y here if you want to build support for the Microchip MCP2120 |
| 115 | dongle. If you want to compile it as a module, choose M here. | 115 | dongle. If you want to compile it as a module, choose M here. |
| @@ -123,7 +123,7 @@ config MCP2120_DONGLE | |||
| 123 | 123 | ||
| 124 | config OLD_BELKIN_DONGLE | 124 | config OLD_BELKIN_DONGLE |
| 125 | tristate "Old Belkin dongle" | 125 | tristate "Old Belkin dongle" |
| 126 | depends on DONGLE && IRDA && EXPERIMENTAL | 126 | depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL |
| 127 | help | 127 | help |
| 128 | Say Y here if you want to build support for the Adaptec Airport 1000 | 128 | Say Y here if you want to build support for the Adaptec Airport 1000 |
| 129 | and 2000 dongles. If you want to compile it as a module, choose | 129 | and 2000 dongles. If you want to compile it as a module, choose |
| @@ -132,7 +132,7 @@ config OLD_BELKIN_DONGLE | |||
| 132 | 132 | ||
| 133 | config ACT200L_DONGLE | 133 | config ACT200L_DONGLE |
| 134 | tristate "ACTiSYS IR-200L dongle" | 134 | tristate "ACTiSYS IR-200L dongle" |
| 135 | depends on DONGLE && IRDA && EXPERIMENTAL | 135 | depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL |
| 136 | help | 136 | help |
| 137 | Say Y here if you want to build support for the ACTiSYS IR-200L | 137 | Say Y here if you want to build support for the ACTiSYS IR-200L |
| 138 | dongle. If you want to compile it as a module, choose M here. | 138 | dongle. If you want to compile it as a module, choose M here. |