Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[cascardo/linux.git] / drivers / atm / Kconfig

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index f197a19..f1a0a00 100644 (file)
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -391,4 +391,11 @@ config ATM_HE_USE_SUNI
          Support for the S/UNI-Ultra and S/UNI-622 found in the ForeRunner
          HE cards.  This driver provides carrier detection some statistics.
 
+config ATM_SOLOS
+       tristate "Solos ADSL2+ PCI Multiport card driver"
+       depends on PCI
+       select FW_LOADER
+       help
+         Support for the Solos multiport ADSL2+ card.
+
 endif # ATM