---

yaml --- r: 122927 b: refs/heads/master c: 9c54004 h: refs/heads/master i: 122925: 818853c 122923: 1809aae 122919: 55770ed 122911: ec31b5a v: v3
git-mirror · Dec 26, 2008 · 2a44151 · 2a44151
1 parent 2f8a72d
commit 2a44151
Show file tree

Hide file tree

Showing 4 changed files with 798 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 236b87c29953a87a6817e96e311b0efd00e95dc7
+refs/heads/master: 9c54004ea717116a10886e254e26502ffb1136e9
diff --git a/trunk/drivers/atm/Kconfig b/trunk/drivers/atm/Kconfig
@@ -391,4 +391,10 @@ 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
+	help
+	  Support for the Solos multiport ADSL2+ card.
+
 endif # ATM
diff --git a/trunk/drivers/atm/Makefile b/trunk/drivers/atm/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_ATM_IA)		+= iphase.o suni.o
 obj-$(CONFIG_ATM_FORE200E)	+= fore_200e.o
 obj-$(CONFIG_ATM_ENI)		+= eni.o suni.o
 obj-$(CONFIG_ATM_IDT77252)	+= idt77252.o
+obj-$(CONFIG_ATM_SOLOS)		+= solos-pci.o
 
 ifeq ($(CONFIG_ATM_NICSTAR_USE_SUNI),y)
   obj-$(CONFIG_ATM_NICSTAR)	+= suni.o