Add 2.6.22 patch thanks to André Malo <nd@perlig.de> in bug 185114

Package-Manager: portage-2.1.3_rc7

4 files changed, 482 insertions, 11 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 54532e4bf7fa..e1824969823a 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.29 2007/06/27 21:10:46 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.30 2007/07/13 08:00:12 genstef Exp $
+
+  13 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/fcdsl-2.6.22.diff, fcdsl-2.6.37.ebuild:
+  Add 2.6.22 patch thanks to André Malo <nd@perlig.de> in bug 185114
 
   27 Jun 2007; Stefan Schweizer <genstef@gentoo.org> +files/usb-2.6.20.diff,
   fcdsl-2.6.37.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index daad4dc0d754..43e686ea1be9 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -2,6 +2,10 @@ AUX fcdsl-2.6.20.diff 11848 RMD160 5a57707400fff8d8391539ba5a91ba1552ea0afa SHA1
 MD5 17d295cfca2fc1eeb9253099853a4eea files/fcdsl-2.6.20.diff 11848
 RMD160 5a57707400fff8d8391539ba5a91ba1552ea0afa files/fcdsl-2.6.20.diff 11848
 SHA256 535568804995cbfbae733ae777802fff5b48edf67858db38fdeaf3341edf3ac8 files/fcdsl-2.6.20.diff 11848
+AUX fcdsl-2.6.22.diff 16368 RMD160 340a51e3f4ad3659205dea6ca61f4260d0ca6bee SHA1 5cc50aeac5c0a3749cf17bc4a18bc90c26d58976 SHA256 1c784fce3a9aa98d4a4db78700017b301a74847f7a3168809dcbd29c758d6af4
+MD5 fa9b250fbe66ab66e7b29b2fcff5e74e files/fcdsl-2.6.22.diff 16368
+RMD160 340a51e3f4ad3659205dea6ca61f4260d0ca6bee files/fcdsl-2.6.22.diff 16368
+SHA256 1c784fce3a9aa98d4a4db78700017b301a74847f7a3168809dcbd29c758d6af4 files/fcdsl-2.6.22.diff 16368
 AUX fcdsl.diff 4636 RMD160 cbb6808cc70d914352153ffa38971f331977c432 SHA1 9194d797666a011fb1f6f3f6b88e6014c81e5241 SHA256 6e30c6dd4f5e00f519b738c704171be15c7d8721fdce18a801b54fc62be9bb8c
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
 RMD160 cbb6808cc70d914352153ffa38971f331977c432 files/fcdsl.diff 4636
@@ -26,14 +30,14 @@ DIST avm_fcdsl-2.6-37.i586.rpm 1059204 RMD160 3ab3bb6a8006167004c93c5348f07d4fc6
 DIST avm_fcdsl-2.6-37.x86_64.rpm 1064850 RMD160 f0a76d19f0ed2221f872e42dbc38cba874d31137 SHA1 a4527480201060bcfd6b4ce8c60033fa30b67be1 SHA256 b9498312286e7d3f8c3bd7ac202e7bd75245fd93dc9aa8f2c784ace90a955757
 DIST km_fcdsl-2.6-37.i586.rpm 2447670 RMD160 a8372219af67b1a9d5c27d0c382f30b5c05a2e7e SHA1 13a63e79a78f5a17d3aabb8b240ea4aada417a70 SHA256 8d767da36061ed4a0a9ee84b989d1810bcde0dab0474087b7e85e2bbc0751e4e
 DIST km_fcdsl-2.6-37.x86_64.rpm 1792580 RMD160 8484ee301a6d603a7d9d0e1c97bc8d542e31833c SHA1 d40520e4a2464f42d870041456790e989fe7b809 SHA256 0412b03faa8b4f0e0b90e915e9492ae345fe7a797270b682de64b65ed9d20d33
-EBUILD fcdsl-2.6.37.ebuild 8221 RMD160 ab1b87979bbce7303dadc217f19eea1fd0426f73 SHA1 f3fb4ae902737a40993268a0f5b8ac648747f7aa SHA256 399db00f6abe13464741af87b577f3a11dd0214b9053498e7f39cf35a90889b7
-MD5 e55ca1969ac8bfab9a4928670e92ff90 fcdsl-2.6.37.ebuild 8221
-RMD160 ab1b87979bbce7303dadc217f19eea1fd0426f73 fcdsl-2.6.37.ebuild 8221
-SHA256 399db00f6abe13464741af87b577f3a11dd0214b9053498e7f39cf35a90889b7 fcdsl-2.6.37.ebuild 8221
-MISC ChangeLog 5143 RMD160 3561c4105c5ba3a71d14902b1e7dab2f7ee0497b SHA1 6d71adc4e96bab0151a51cd165703974b8b07333 SHA256 85e2fc02301aad9d03ed4bafa027095d45e5e616ff6c03a8c4001b679d840690
-MD5 cc66b685d099d3a7447a92a59b1783e4 ChangeLog 5143
-RMD160 3561c4105c5ba3a71d14902b1e7dab2f7ee0497b ChangeLog 5143
-SHA256 85e2fc02301aad9d03ed4bafa027095d45e5e616ff6c03a8c4001b679d840690 ChangeLog 5143
+EBUILD fcdsl-2.6.37.ebuild 8339 RMD160 e1c43b2b8150a35f6a0f7d166bf09422308ccded SHA1 fb08665d325cbdb9c259e90a56a15c5e5e3f8baa SHA256 9ee97a2f84d6c527feca3abc713ec27d3e8d39a05a0d691f80f92b0ae9d061c4
+MD5 0396583e567ccabd80503b0b09b0787b fcdsl-2.6.37.ebuild 8339
+RMD160 e1c43b2b8150a35f6a0f7d166bf09422308ccded fcdsl-2.6.37.ebuild 8339
+SHA256 9ee97a2f84d6c527feca3abc713ec27d3e8d39a05a0d691f80f92b0ae9d061c4 fcdsl-2.6.37.ebuild 8339
+MISC ChangeLog 5316 RMD160 01bbef101117676dafcf7f8b95b9beca25e6d65e SHA1 b7fed98bafa4b92ed21caa7a9defd0019cc778b3 SHA256 c4ab40e161a847b716cc6d828cab84977d659054cdb87e1b8a0e328de4ff7501
+MD5 f0b3d459de1592bbd7fa1e3e0d8cdf9a ChangeLog 5316
+RMD160 01bbef101117676dafcf7f8b95b9beca25e6d65e ChangeLog 5316
+SHA256 c4ab40e161a847b716cc6d828cab84977d659054cdb87e1b8a0e328de4ff7501 ChangeLog 5316
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index b745b2482731..bd4e19a4398e 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.7 2007/06/27 21:10:46 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.8 2007/07/13 08:00:12 genstef Exp $
 
 inherit linux-mod eutils rpm
 
@@ -76,7 +76,11 @@ src_unpack() {
 		usr/src/kernel-modules/fcdsl/src/src.fcdslusb
 	# do not fail even if some drivers are not present
 	einfo "When you have FCDSL_CARDS set some errors are OK here"
-	patch -p0 -f < ${FILESDIR}/fcdsl-2.6.20.diff
+	if kernel_is ge 2 6 22 ; then
+		patch -p0 -f < "${FILESDIR}"/fcdsl-2.6.22.diff
+	elif kernel_is ge 2 6 20 ; then
+		patch -p0 -f < ${FILESDIR}/fcdsl-2.6.20.diff
+	fi
 	patch -p0 -f < ${FILESDIR}/fcdslslusb-2.6.20.diff
 	cd usr/src/kernel-modules/fcdsl/src
 	kernel_is ge 2 6 20 && patch -p1 -f < ${FILESDIR}/usb-2.6.20.diff
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.22.diff b/net-dialup/fcdsl/files/fcdsl-2.6.22.diff
new file mode 100644
index 000000000000..7cb3925737fa
--- /dev/null
+++ b/net-dialup/fcdsl/files/fcdsl-2.6.22.diff
@@ -0,0 +1,459 @@
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
+@@ -122,7 +122,7 @@
+ static void			rx_task (unsigned long data);
+ static void			tx_handler (card_p cp);
+ static void			rx_handler (card_p cp);
+-static irqreturn_t		irq_handler (int, void *, struct pt_regs *);
++static irqreturn_t		irq_handler (int, void *);
+ static void			enable_thread (void);
+ static void			disable_thread (void);
+ static int			make_thread (void);
+@@ -1549,7 +1549,7 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
++static irqreturn_t irq_handler (int irq, void * args) {
+ 	unsigned long	flags;
+ 	int		tx_flag	= 0;
+ 	int		rx_flag	= 0;
+@@ -1557,7 +1557,6 @@
+ 	card_p		cp;
+ 	
+ 	UNUSED_ARG (irq);
+-	UNUSED_ARG (regs);
+ 	if (capi_card != (card_p) args) {
+ 		return IRQ_NONE;
+ 	}
+@@ -1797,19 +1796,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib != NULL);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
+@@ -23,7 +23,7 @@
+ #ifndef __have_driver_h__
+ #define __have_driver_h__
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/pci.h>
+ #include <linux/list.h>
+ #include <linux/skbuff.h>
+@@ -139,8 +139,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -115,14 +115,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE( "Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		ERROR("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		ERROR("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -143,7 +143,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (card);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR( "%u bytes leaked.\n", hallocated());
+@@ -196,7 +196,7 @@
+ 		return -ENOSYS;
+ 	}
+ 
+-	if (0 == (err = pci_module_init (&fcdsl_driver))) {
++	if (0 == (err = pci_register_driver (&fcdsl_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fcdsl_capi_driver);
+ 		LOG("CAPI driver registered.\n");
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c
+@@ -747,12 +747,11 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-irqreturn_t device_interrupt (int irq, void * args, struct pt_regs * regs) {
++irqreturn_t device_interrupt (int irq, void * args) {
+ 	unsigned long	intpins;
+ 	card_p		cp	= (card_p) args;
+ 
+ 	UNUSED_ARG (irq);
+-	UNUSED_ARG (regs);
+ 	assert (capi_card == cp);
+ 
+ 	intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h
+@@ -80,7 +80,7 @@
+ extern void set_interrupt_callback (irq_callback_t, void *);
+ extern void clear_interrupt_callback (void);
+ 
+-extern irqreturn_t device_interrupt (int, void *, struct pt_regs *);
++extern irqreturn_t device_interrupt (int, void *);
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
+@@ -1563,19 +1563,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/pci.h>
+ #include <linux/spinlock.h>
+@@ -161,8 +161,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -116,14 +116,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE("Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		NOTE("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		NOTE("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -144,7 +144,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (cp);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR("%u bytes leaked.\n", hallocated());
+@@ -195,7 +195,7 @@
+ 	NOTE("-- 32 bit CAPI driver --\n");
+ #endif
+ 
+-	if (0 == (err = pci_module_init (&fcdsl2_driver))) {
++	if (0 == (err = pci_register_driver (&fcdsl2_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fcdsl2_capi_driver);
+ 		LOG("CAPI driver registered.\n");
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c
+@@ -747,12 +747,11 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-irqreturn_t device_interrupt (int irq, void * args, struct pt_regs * regs) {
++irqreturn_t device_interrupt (int irq, void * args) {
+ 	unsigned long	intpins;
+ 	card_p		cp	= (card_p) args;
+ 
+ 	UNUSED_ARG (irq);
+-	UNUSED_ARG (regs);
+ 	assert (capi_card == cp);
+ 
+ 	intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h
+@@ -80,7 +80,7 @@
+ extern void set_interrupt_callback (irq_callback_t, void *);
+ extern void clear_interrupt_callback (void);
+ 
+-extern irqreturn_t device_interrupt (int, void *, struct pt_regs *);
++extern irqreturn_t device_interrupt (int, void *);
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
+@@ -1563,19 +1563,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/pci.h>
+ #include <linux/spinlock.h>
+@@ -161,8 +161,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -116,14 +116,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE("Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		NOTE("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		NOTE("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -144,7 +144,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (cp);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR("%u bytes leaked.\n", hallocated());
+@@ -195,7 +195,7 @@
+ 	NOTE("-- 32 bit CAPI driver --\n");
+ #endif
+ 
+-	if (0 == (err = pci_module_init (&fcdsl2_driver))) {
++	if (0 == (err = pci_register_driver (&fcdsl2_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fcdsl2_capi_driver);
+ 		LOG("CAPI driver registered.\n");
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
+@@ -27,7 +27,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/usb.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
+@@ -25,7 +25,7 @@
+ 
+ #include <asm/semaphore.h>
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/capi.h>
+ #include <linux/isdn/capilli.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
+@@ -27,7 +27,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/usb.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+ 
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
+--- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
++++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
+@@ -27,7 +27,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/usb.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>