diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/ft1000/Kconfig | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000/Kconfig')
| -rw-r--r-- | drivers/staging/ft1000/Kconfig | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/staging/ft1000/Kconfig b/drivers/staging/ft1000/Kconfig new file mode 100644 index 0000000..d6da130 --- /dev/null +++ b/drivers/staging/ft1000/Kconfig @@ -0,0 +1,22 @@ +config FT1000 + tristate "Drivers for Flarion ft1000 devices" + +if FT1000 + +config FT1000_USB + tristate "Driver for ft1000 usb devices." + depends on USB + depends on NET + help + Say Y if you want to have support for Qleadtek FLASH-OFDM USB Modem [LR7F04], + Qleadtek Express Card or Leadtek Multi-band modem HSDPA. + +config FT1000_PCMCIA + tristate "Driver for ft1000 pcmcia device." + depends on PCMCIA && BROKEN + depends on NET + help + Say Y if you want to have support for Flarion card also called + Multimedia Net Card. + +endif |
