Merge with 2.3.19.

1 files changed, 48 insertions, 10 deletions

diff --git a/drivers/isdn/avmb1/Makefile b/drivers/isdn/avmb1/Makefile
index cce4af131..9f73ea2e3 100644
--- a/drivers/isdn/avmb1/Makefile
+++ b/drivers/isdn/avmb1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1997/03/30 17:10:40 calle Exp $
+# $Id: Makefile,v 1.6 1999/07/20 06:41:44 calle Exp $
 #
 # Makefile for the CAPI and AVM-B1 device drivers.
 #
@@ -11,6 +11,26 @@
 # parent makes..
 #
 # $Log: Makefile,v $
+# Revision 1.6  1999/07/20 06:41:44  calle
+# Bugfix: After the redesign of the AVM B1 driver, the driver didn't even
+#         compile, if not selected as modules.
+#
+# Revision 1.5  1999/07/01 15:26:20  calle
+# complete new version (I love it):
+# + new hardware independed "capi_driver" interface that will make it easy to:
+#   - support other controllers with CAPI-2.0 (i.e. USB Controller)
+#   - write a CAPI-2.0 for the passive cards
+#   - support serial link CAPI-2.0 boxes.
+# + wrote "capi_driver" for all supported cards.
+# + "capi_driver" (supported cards) now have to be configured with
+#   make menuconfig, in the past all supported cards where included
+#   at once.
+# + new and better informations in /proc/capi/
+# + new ioctl to switch trace of capi messages per controller
+#   using "avmcapictrl trace [contr] on|off|...."
+# + complete testcircle with all supported cards and also the
+#   PCMCIA cards (now patch for pcmcia-cs-3.0.13 needed) done.
+#
 # Revision 1.4  1997/03/30 17:10:40  calle
 # added support for AVM-B1-PCI card.
 #
@@ -56,20 +76,38 @@ L_TARGET := # used for .a targets (from L and LX objects)
 
 ifeq ($(CONFIG_ISDN_DRV_AVMB1),y)
   O_TARGET += avmb1.o
-  O_OBJS   += capi.o b1lli.o
-  OX_OBJS  += capiutil.o b1capi.o capidrv.o
-  ifdef CONFIG_PCI
-  OX_OBJS  += b1pci.o
+  OX_OBJS  += kcapi.o
+  O_OBJS   += capi.o
+  ifdef CONFIG_ISDN_DRV_AVMB1_B1ISA
+  O_OBJS   += b1isa.o
+  endif
+  ifdef CONFIG_ISDN_DRV_AVMB1_B1PCI
+  O_OBJS  += b1pci.o
+  endif
+  ifdef CONFIG_ISDN_DRV_AVMB1_T1ISA
+  O_OBJS   += t1isa.o
+  endif
+  ifdef CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
+  OX_OBJS   += b1pcmcia.o
   endif
+  OX_OBJS  += capiutil.o capidrv.o b1.o
 else
   ifeq ($(CONFIG_ISDN_DRV_AVMB1),m)
   O_TARGET += kernelcapi.o
-  O_OBJS   += b1lli.o
-  OX_OBJS  += b1capi.o
+  OX_OBJS  += kcapi.o
   M_OBJS   += capi.o kernelcapi.o
-  MX_OBJS  += capiutil.o capidrv.o
-  ifdef CONFIG_PCI
-  MX_OBJS  += b1pci.o
+  ifdef CONFIG_ISDN_DRV_AVMB1_B1ISA
+  M_OBJS   += b1isa.o
+  endif
+  ifdef CONFIG_ISDN_DRV_AVMB1_B1PCI
+  M_OBJS  += b1pci.o
+  endif
+  ifdef CONFIG_ISDN_DRV_AVMB1_T1ISA
+  M_OBJS   += t1isa.o
+  endif
+  MX_OBJS  += capiutil.o capidrv.o b1.o
+  ifdef CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
+  MX_OBJS  += b1pcmcia.o
   endif
   endif
 endif