summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/isdn_cards.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/isdn/isdn_cards.c
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/isdn/isdn_cards.c')
-rw-r--r--drivers/isdn/isdn_cards.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/isdn/isdn_cards.c b/drivers/isdn/isdn_cards.c
index c7f4e8b08..30a4a7703 100644
--- a/drivers/isdn/isdn_cards.c
+++ b/drivers/isdn/isdn_cards.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_cards.c,v 1.6 1997/04/23 18:56:03 fritz Exp $
+/* $Id: isdn_cards.c,v 1.7 1998/02/20 17:24:28 fritz Exp $
* Linux ISDN subsystem, initialization for non-modularized drivers.
*
@@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: isdn_cards.c,v $
+ * Revision 1.7 1998/02/20 17:24:28 fritz
+ * Added ACT2000 init.
+ *
* Revision 1.6 1997/04/23 18:56:03 fritz
* Old Teles driver removed, Changed doc and scripts accordingly.
*
@@ -82,4 +85,7 @@ isdn_cards_init(void)
capi_init();
capidrv_init();
#endif
+#if CONFIG_ISDN_DRV_ACT2000
+ act2000_init();
+#endif
}