Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353690
b: refs/heads/master
c: 91d0945
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 22, 2013
1 parent b5a480f commit 14774a9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d703cb32ebbbebaa98a22c8c02d7a8a126ab8f38
refs/heads/master: 91d09454b146e986d917e638781f3e759c6647f6
36 changes: 18 additions & 18 deletions trunk/drivers/net/irda/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ config LITELINK_DONGLE

config MA600_DONGLE
tristate "Mobile Action MA600 dongle"
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
depends on IRTTY_SIR && DONGLE && IRDA
help
Say Y here if you want to build support for the Mobile Action MA600
dongle. To compile it as a module, choose M here. The MA600 dongle
Expand All @@ -153,7 +153,7 @@ config MA600_DONGLE

config GIRBIL_DONGLE
tristate "Greenwich GIrBIL dongle"
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
depends on IRTTY_SIR && DONGLE && IRDA
help
Say Y here if you want to build support for the Greenwich GIrBIL
dongle. If you want to compile it as a module, choose M here.
Expand All @@ -164,7 +164,7 @@ config GIRBIL_DONGLE

config MCP2120_DONGLE
tristate "Microchip MCP2120"
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
depends on IRTTY_SIR && DONGLE && IRDA
help
Say Y here if you want to build support for the Microchip MCP2120
dongle. If you want to compile it as a module, choose M here.
Expand All @@ -178,7 +178,7 @@ config MCP2120_DONGLE

config OLD_BELKIN_DONGLE
tristate "Old Belkin dongle"
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
depends on IRTTY_SIR && DONGLE && IRDA
help
Say Y here if you want to build support for the Adaptec Airport 1000
and 2000 dongles. If you want to compile it as a module, choose
Expand All @@ -187,7 +187,7 @@ config OLD_BELKIN_DONGLE

config ACT200L_DONGLE
tristate "ACTiSYS IR-200L dongle"
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
depends on IRTTY_SIR && DONGLE && IRDA
help
Say Y here if you want to build support for the ACTiSYS IR-200L
dongle. If you want to compile it as a module, choose M here.
Expand All @@ -198,7 +198,7 @@ config ACT200L_DONGLE

config KINGSUN_DONGLE
tristate "KingSun/DonShine DS-620 IrDA-USB dongle"
depends on IRDA && USB && EXPERIMENTAL
depends on IRDA && USB
help
Say Y or M here if you want to build support for the KingSun/DonShine
DS-620 IrDA-USB bridge device driver.
Expand All @@ -212,14 +212,14 @@ config KINGSUN_DONGLE

config EP7211_DONGLE
tristate "Cirrus Logic clps711x I/R support"
depends on IRTTY_SIR && ARCH_CLPS711X && IRDA && EXPERIMENTAL
depends on IRTTY_SIR && ARCH_CLPS711X && IRDA
help
Say Y here if you want to build support for the Cirrus logic
EP7211 chipset's infrared module.

config KSDAZZLE_DONGLE
tristate "KingSun Dazzle IrDA-USB dongle (EXPERIMENTAL)"
depends on IRDA && USB && EXPERIMENTAL
tristate "KingSun Dazzle IrDA-USB dongle"
depends on IRDA && USB
help
Say Y or M here if you want to build support for the KingSun Dazzle
IrDA-USB bridge device driver.
Expand All @@ -232,8 +232,8 @@ config KSDAZZLE_DONGLE
ksdazzle-sir.

config KS959_DONGLE
tristate "KingSun KS-959 IrDA-USB dongle (EXPERIMENTAL)"
depends on IRDA && USB && EXPERIMENTAL
tristate "KingSun KS-959 IrDA-USB dongle"
depends on IRDA && USB
help
Say Y or M here if you want to build support for the KingSun KS-959
IrDA-USB bridge device driver.
Expand Down Expand Up @@ -264,8 +264,8 @@ config USB_IRDA
you will need both USB and IrDA support in your kernel...

config SIGMATEL_FIR
tristate "SigmaTel STIr4200 bridge (EXPERIMENTAL)"
depends on IRDA && USB && EXPERIMENTAL
tristate "SigmaTel STIr4200 bridge"
depends on IRDA && USB
select CRC32
---help---
Say Y here if you want to build support for the SigmaTel STIr4200
Expand Down Expand Up @@ -331,8 +331,8 @@ config SMC_IRCC_FIR
smsc-ircc2.o.

config ALI_FIR
tristate "ALi M5123 FIR (EXPERIMENTAL)"
depends on EXPERIMENTAL && IRDA && ISA_DMA_API
tristate "ALi M5123 FIR"
depends on IRDA && ISA_DMA_API
help
Say Y here if you want to build support for the ALi M5123 FIR
Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C,
Expand All @@ -343,8 +343,8 @@ config ALI_FIR
ali-ircc.

config VLSI_FIR
tristate "VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)"
depends on EXPERIMENTAL && IRDA && PCI
tristate "VLSI 82C147 SIR/MIR/FIR"
depends on IRDA && PCI
help
Say Y here if you want to build support for the VLSI 82C147
PCI-IrDA Controller. This controller is used by the HP OmniBook 800
Expand Down Expand Up @@ -387,7 +387,7 @@ config PXA_FICP

config MCS_FIR
tristate "MosChip MCS7780 IrDA-USB dongle"
depends on IRDA && USB && EXPERIMENTAL
depends on IRDA && USB
select CRC32
help
Say Y or M here if you want to build support for the MosChip
Expand Down

0 comments on commit 14774a9

Please sign in to comment.