Fix building with 2.6.19 and 2.6.20 thanks to André Malo <nd@perlig.de> in bug 165485

Package-Manager: portage-2.1.2-r9

4 files changed, 372 insertions, 22 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 010ff6665232..d4854a7382be 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fcdsl
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.25 2006/09/21 13:24:54 mrness Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.26 2007/02/12 20:04:49 genstef Exp $
+
+  12 Feb 2007; <genstef@gentoo.org> +files/fcdsl-2.6.20.diff,
+  fcdsl-2.6.37.ebuild:
+  Fix building with 2.6.19 and 2.6.20 thanks to André Malo <nd@perlig.de> in
+  bug 165485
 
   21 Sep 2006; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r5.ebuild,
   -fcdsl-2.6.30.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index beb26a605815..7ad5680495ce 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fcdsl-2.6.20.diff 11848 RMD160 5a57707400fff8d8391539ba5a91ba1552ea0afa SHA1 fec9cf9d9feeaaa5bc6d687d4c68afd3b677f320 SHA256 535568804995cbfbae733ae777802fff5b48edf67858db38fdeaf3341edf3ac8
+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.diff 4636 RMD160 cbb6808cc70d914352153ffa38971f331977c432 SHA1 9194d797666a011fb1f6f3f6b88e6014c81e5241 SHA256 6e30c6dd4f5e00f519b738c704171be15c7d8721fdce18a801b54fc62be9bb8c
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
 RMD160 cbb6808cc70d914352153ffa38971f331977c432 files/fcdsl.diff 4636
@@ -17,14 +18,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 7906 RMD160 c2a1f9028b1233e3113b4ce942dad4f550e7686a SHA1 6144a7af88bca848fb2147c2db9ee98eeb33b2e3 SHA256 fe6e054dbd804618c1f266cf25ccb2891bf2f8f73f141ee0d9dead445fb7c993
-MD5 8a7229d1cbaab6c5dc037eb2cce9fcd9 fcdsl-2.6.37.ebuild 7906
-RMD160 c2a1f9028b1233e3113b4ce942dad4f550e7686a fcdsl-2.6.37.ebuild 7906
-SHA256 fe6e054dbd804618c1f266cf25ccb2891bf2f8f73f141ee0d9dead445fb7c993 fcdsl-2.6.37.ebuild 7906
-MISC ChangeLog 4495 RMD160 72743acd135136f2607fc905b97226b26ad6c288 SHA1 efa9218b91b0349c486bc714b79ec75cbf163c27 SHA256 7400d96200a0c730a01adcc63dec0605d97ffebdb4f74952f322d7bf98b703d2
-MD5 a19d41fbcdeb45b2b403e131bad9858e ChangeLog 4495
-RMD160 72743acd135136f2607fc905b97226b26ad6c288 ChangeLog 4495
-SHA256 7400d96200a0c730a01adcc63dec0605d97ffebdb4f74952f322d7bf98b703d2 ChangeLog 4495
+EBUILD fcdsl-2.6.37.ebuild 8068 RMD160 56e3333a4b9072df5ca3847578e089b14520388a SHA1 5ccf85b8c7b36dfb247c2692b8c8388e6e422027 SHA256 875723e97f612bfeef6e905457413f497df7cad61e288f47c32720759d719c57
+MD5 a980301e44f612ab740547b9c9207476 fcdsl-2.6.37.ebuild 8068
+RMD160 56e3333a4b9072df5ca3847578e089b14520388a fcdsl-2.6.37.ebuild 8068
+SHA256 875723e97f612bfeef6e905457413f497df7cad61e288f47c32720759d719c57 fcdsl-2.6.37.ebuild 8068
+MISC ChangeLog 4673 RMD160 97147372950aed6e5cd23c5a0b3d7bc3a32d1dc5 SHA1 ab2f4ba1c97674764900e39fef2a61984c58bd47 SHA256 26682df3f3a80412b1124d630b1460485ff4a3a8a1b33d52a6046c5caa458b0a
+MD5 41627a086c93a7b6f63befbfc9cff985 ChangeLog 4673
+RMD160 97147372950aed6e5cd23c5a0b3d7bc3a32d1dc5 ChangeLog 4673
+SHA256 26682df3f3a80412b1124d630b1460485ff4a3a8a1b33d52a6046c5caa458b0a ChangeLog 4673
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -32,10 +33,3 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 e41c4dcf268ff09e5857f2c60e586cbc files/digest-fcdsl-2.6.37 1042
 RMD160 d492ceb309343268216cdad8a1f78731fb32e0ba files/digest-fcdsl-2.6.37 1042
 SHA256 9a82e617c81de5fd9ccdffa972127d6f4a4cbc6b1dbba90df5f6d567ec720c3d files/digest-fcdsl-2.6.37 1042
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFEpK03sf9c6kjmR8RArkkAJ43b6HZZhKWr4RmmK5uRj8gNcYYfgCfYzLZ
-/eGKMxWAwdSnTyan+vXCoSY=
-=X+NO
------END PGP SIGNATURE-----
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index 88042eac6bc4..64748bb13db6 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-2006 Gentoo Foundation
+# 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.3 2006/04/27 17:40:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.4 2007/02/12 20:04:49 genstef Exp $
 
 inherit linux-mod eutils rpm
 
@@ -74,6 +74,9 @@ src_unpack() {
 	cd "${S}"
 	mv usr/src/kernel-modules/fcdsl/src/src.fcdslusb1 \
 		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 use x86; then
 		for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.20.diff b/net-dialup/fcdsl/files/fcdsl-2.6.20.diff
new file mode 100644
index 000000000000..268504c99913
--- /dev/null
+++ b/net-dialup/fcdsl/files/fcdsl-2.6.20.diff
@@ -0,0 +1,348 @@
+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
+@@ -1823,19 +1823,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());
+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
+@@ -1576,19 +1576,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());
+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
+@@ -1577,19 +1577,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());
+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>