[XFS] Fix merge failures

[pandora-kernel.git] / drivers / atm / Makefile

diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
index 0bfb317..62c3cc1 100644 (file)
--- a/drivers/atm/Makefile
+++ b/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