[LV-kern-commit] CVS: kernel-2.4/drivers/isdn Config.in,1.2,1.3 isdn_audio.c,1.2,1.3 isdn_audio.h,1.2,1.3 isdn_common.c,1.2,1.3 isdn_common.h,1.2,1.3 isdn_concap.c,1.2,1.3 isdn_concap.h,1.2,1.3 isdn_net.c,1.2,1.3 isdn_net.h,1.2,1.3 isdn_ppp.c,1.2,1.3 isdn_ppp.h,1.2,1.3 isdn_tty.c,1.2,1.3 isdn_tty.h,1.2,1.3 isdn_ttyfax.c,1.2,1.3 isdn_ttyfax.h,1.2,1.3 isdn_v110.c,1.2,1.3 isdn_v110.h,1.2,1.3 isdn_x25iface.c,1.2,1.3 isdn_x25iface.h,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/isdn
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/isdn

Modified Files:
	Config.in isdn_audio.c isdn_audio.h isdn_common.c 
	isdn_common.h isdn_concap.c isdn_concap.h isdn_net.c 
	isdn_net.h isdn_ppp.c isdn_ppp.h isdn_tty.c isdn_tty.h 
	isdn_ttyfax.c isdn_ttyfax.h isdn_v110.c isdn_v110.h 
	isdn_x25iface.c isdn_x25iface.h 
Log Message:
DA: sync with Marcelo 2.4.17


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/Config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.in	10 Apr 2002 15:32:21 -0000	1.2
+++ Config.in	10 Jun 2003 01:13:32 -0000	1.3
@@ -42,6 +42,7 @@
    fi
    bool '  HiSax Support for german 1TR6' CONFIG_HISAX_1TR6
    bool '  HiSax Support for US NI1' CONFIG_HISAX_NI1
+   int  '  Maximum number of cards supported by HiSax' CONFIG_HISAX_MAX_CARDS 8
    comment '  HiSax supported cards'
    bool '  Teles 16.0/8.0' CONFIG_HISAX_16_0
    bool '  Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3
@@ -81,6 +82,7 @@
    dep_tristate 'Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS $CONFIG_PCMCIA
    dep_tristate 'ELSA PCMCIA MicroLink cards' CONFIG_HISAX_ELSA_CS $CONFIG_PCMCIA
    dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL
+   dep_tristate 'Fritz!PCIv2 support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_HISAX $CONFIG_EXPERIMENTAL
 fi
 endmenu
 

Index: isdn_audio.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_audio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_audio.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_audio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_common.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_common.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_common.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_concap.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_concap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_concap.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_concap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_net.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_net.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_net.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_net.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_ppp.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_ppp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_ppp.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_ppp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_tty.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_tty.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_tty.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_tty.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_ttyfax.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_ttyfax.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_ttyfax.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_ttyfax.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_v110.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_v110.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_v110.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_v110.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_x25iface.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_x25iface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

Index: isdn_x25iface.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/isdn/isdn_x25iface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3