Make kernel patch future-proof (bug #156783 comment #11).

Package-Manager: portage-2.1.1-r2

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index e5d3fdd88d30ed6b38f80c2be8fe6b16a36ff0fc..b2eaca8f6c4eee96bebee8c45b2a48a634bd1671 100644 (file)
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/misdn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.15 2006/12/02 14:06:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.16 2006/12/20 19:48:49 mrness Exp $
+
+  20 Dec 2006; Alin Năstac <mrness@gentoo.org>
+  files/misdn-1.0.4-kernel-2.6.19.patch:
+  Make kernel patch future-proof (bug #156783 comment #11).
 
   02 Dec 2006; Alin Năstac <mrness@gentoo.org>
   +files/misdn-1.0.4-kernel-2.6.19.patch, misdn-1.0.4.ebuild:

diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest
index 2a75d8b8cb8c914fb3c2f2389b3098f3cbc4dd08..08141bf97e984b568df378bcb07c90989e656be4 100644 (file)
--- a/net-dialup/misdn/Manifest
+++ b/net-dialup/misdn/Manifest
@@ -5,19 +5,19 @@ AUX README.hfcmulti 2488 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 SHA1 94
 MD5 4be2313e0dafa1a491fc57e2bf3edca8 files/README.hfcmulti 2488
 RMD160 6c4e62fdfd6ce872b0ec270271ce97954c6374f4 files/README.hfcmulti 2488
 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f files/README.hfcmulti 2488
-AUX misdn-1.0.4-kernel-2.6.19.patch 10517 RMD160 2842ab7c7f174cd5c7c22d2dec7b70b08d34fb45 SHA1 90d32dc21fb1b150d280c6cf03c4d49a3f061681 SHA256 7a520b5b1f822869fd7d1cfd1dc525d6a1491b74048bda6ac43e1876bb46d549
-MD5 08a604b01478c116ada952a60ac057a7 files/misdn-1.0.4-kernel-2.6.19.patch 10517
-RMD160 2842ab7c7f174cd5c7c22d2dec7b70b08d34fb45 files/misdn-1.0.4-kernel-2.6.19.patch 10517
-SHA256 7a520b5b1f822869fd7d1cfd1dc525d6a1491b74048bda6ac43e1876bb46d549 files/misdn-1.0.4-kernel-2.6.19.patch 10517
+AUX misdn-1.0.4-kernel-2.6.19.patch 12408 RMD160 697fba78cfc18faa91ef0334d8a50698a917d8ff SHA1 54e488269cbc317e3f7842b52245ffe186152866 SHA256 2acc4b040653f37969949f24edab8572aa89fa612a0122f89e9d50c3ecca9ba2
+MD5 632de710808890e6956dd7c60452a353 files/misdn-1.0.4-kernel-2.6.19.patch 12408
+RMD160 697fba78cfc18faa91ef0334d8a50698a917d8ff files/misdn-1.0.4-kernel-2.6.19.patch 12408
+SHA256 2acc4b040653f37969949f24edab8572aa89fa612a0122f89e9d50c3ecca9ba2 files/misdn-1.0.4-kernel-2.6.19.patch 12408
 DIST mISDN-1_0_4.tar.gz 762995 RMD160 566e6a0ce15bed1d054239abbce07f38d31354eb SHA1 0b9cfed306cf19cd3e24401166c0b52f5b2302cd SHA256 0584c76ebac01b135afad3db464e443855746bf047276c7e88223834a7b4cec3
 EBUILD misdn-1.0.4.ebuild 5368 RMD160 54e6a5202561972ee63e9c4d32a793a73633ef6c SHA1 4205d31a5495dbc73ba3a6b1fd2071a61c577dbe SHA256 7dff44463ecbf9e28b88e02b64b08a3d0d36d3844691bb248d508f400b32a862
 MD5 e91424a92a268aab18364da20a8816a5 misdn-1.0.4.ebuild 5368
 RMD160 54e6a5202561972ee63e9c4d32a793a73633ef6c misdn-1.0.4.ebuild 5368
 SHA256 7dff44463ecbf9e28b88e02b64b08a3d0d36d3844691bb248d508f400b32a862 misdn-1.0.4.ebuild 5368
-MISC ChangeLog 3206 RMD160 72c3173aac29ed31eb7f9f8b7a7a9ccfb5add9fb SHA1 15396afe6e7e91b17b6d9e394a2c2f3bcac76834 SHA256 74a43a2204a29a1e211360a7293e779fda42005525a7b82796ae24c546e59825
-MD5 0c17ba6f7c2eb925d40f67a47883ef1a ChangeLog 3206
-RMD160 72c3173aac29ed31eb7f9f8b7a7a9ccfb5add9fb ChangeLog 3206
-SHA256 74a43a2204a29a1e211360a7293e779fda42005525a7b82796ae24c546e59825 ChangeLog 3206
+MISC ChangeLog 3356 RMD160 2767685298e0215123c7592889ad47fca4b99a9b SHA1 0f1681b79efa4897344a574df6cf168cc4778450 SHA256 31c029ee49c6e22c2b7aa236782d4af7fdc46125f005caf548310a3f99fa630b
+MD5 79f06aa2956f2c15d45cb19b031e333d ChangeLog 3356
+RMD160 2767685298e0215123c7592889ad47fca4b99a9b ChangeLog 3356
+SHA256 31c029ee49c6e22c2b7aa236782d4af7fdc46125f005caf548310a3f99fa630b ChangeLog 3356
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -26,9 +26,9 @@ MD5 74f350eeb1253ae9a803b7a4edc207d1 files/digest-misdn-1.0.4 235
 RMD160 145b9b657007c0af2f5d8e45a477dc510b60e0c6 files/digest-misdn-1.0.4 235
 SHA256 f2e255a95860950afb70f0ecd0854596965aeae689ee3cb8721e3b7ef1ad2b1e files/digest-misdn-1.0.4 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFcYhk3sf9c6kjmR8RAgtUAJ9PmdOyFbSgYaBemlxf1KrIre8cJwCggEz6
-FQC8kvWk/sap8Lna7HznGzU=
-=EDgV
+iD8DBQFFiZOs3sf9c6kjmR8RAkjGAKCSPDIYGdNpBkYc2UpImAaki2Xm+gCgj86H
+DmKGMh5BJiyXFgRWC397j/I=
+=RyiY
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch b/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch
index eb0c46a2d348ee050ae45cf61da8d3580dd23273..c0b05d4424a67fe2752d720578853f172b202fe0 100644 (file)
--- a/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch
+++ b/net-dialup/misdn/files/misdn-1.0.4-kernel-2.6.19.patch
@@ -1,262 +1,328 @@
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/avm_fritz.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/avm_fritz.c   2006-07-03 12:16:08.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/avm_fritz.c        2006-12-02 15:56:52.345830409 +0200
-@@ -8,7 +8,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/avm_fritz.c        2006-12-20 21:43:48.000000000 +0200
+@@ -8,7 +8,10 @@
   * This file is (c) under GNU PUBLIC LICENSE
   *
   */
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/pci.h>
  #ifdef NEW_ISAPNP
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/core.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/core.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/core.c        2006-08-08 12:18:44.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/core.c     2006-12-02 15:57:30.084188909 +0200
-@@ -8,7 +8,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/core.c     2006-12-20 21:43:07.000000000 +0200
+@@ -8,7 +8,10 @@
  
  #include <linux/types.h>
  #include <linux/stddef.h>
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/spinlock.h>
  #include "core.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/dsp_core.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dsp_core.c    2006-09-13 16:58:02.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/dsp_core.c 2006-12-02 15:55:33.760919158 +0200
-@@ -172,7 +172,7 @@
- const char *dsp_revision = "$Revision: 1.1 $";
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/dsp_core.c 2006-12-20 21:43:59.000000000 +0200
+@@ -172,7 +172,10 @@
+ const char *dsp_revision = "$Revision: 1.2 $";
  
  #include <linux/delay.h>
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/vmalloc.h>
  #include "layer1.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dtmf.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/dtmf.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/dtmf.c        2006-07-03 12:16:08.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/dtmf.c     2006-12-02 15:56:12.887364410 +0200
-@@ -15,7 +15,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/dtmf.c     2006-12-20 21:43:33.000000000 +0200
+@@ -15,7 +15,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include "layer1.h"
  #include "helper.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/faxl3.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/faxl3.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/faxl3.c       2006-03-23 15:56:11.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/faxl3.c    2006-12-02 15:56:32.308578159 +0200
-@@ -11,7 +11,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/faxl3.c    2006-12-20 21:44:37.000000000 +0200
+@@ -11,7 +11,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include "layer1.h"
  #include "m_capi.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfc_multi.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfc_multi.c   2006-10-09 15:51:33.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfc_multi.c        2006-12-02 15:57:36.220572410 +0200
-@@ -93,7 +93,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfc_multi.c        2006-12-20 21:44:46.000000000 +0200
+@@ -93,7 +93,10 @@
  /* debug using register map (never use this, it will flood your system log) */
  //#define HFC_REGISTER_MAP
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/pci.h>
  #include <linux/delay.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_mini.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c   2006-07-03 12:16:08.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_mini.c        2006-12-02 15:54:52.922366908 +0200
-@@ -49,7 +49,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_mini.c        2006-12-20 21:45:02.000000000 +0200
+@@ -49,7 +49,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/delay.h>
  #include <asm/timex.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_usb.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c    2006-09-04 16:32:14.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_usb.c 2006-12-02 15:57:42.092939408 +0200
-@@ -28,7 +28,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/hfcs_usb.c 2006-12-20 21:42:15.000000000 +0200
+@@ -28,7 +28,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/delay.h>
  #include <linux/usb.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/i4l_mISDN.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c   2006-03-23 15:56:11.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/i4l_mISDN.c        2006-12-02 15:56:19.015747409 +0200
-@@ -10,7 +10,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/i4l_mISDN.c        2006-12-20 21:43:25.000000000 +0200
+@@ -10,7 +10,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/isdnif.h>
  #include <linux/delay.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/l1oip.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/l1oip.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/l1oip.c       2006-03-23 15:56:11.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/l1oip.c    2006-12-02 15:57:10.122941410 +0200
-@@ -207,7 +207,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/l1oip.c    2006-12-20 21:41:42.000000000 +0200
+@@ -207,7 +207,10 @@
  */
  
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/delay.h>
  
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/layer1.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/layer1.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/layer1.c      2006-10-09 15:51:33.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/layer1.c   2006-12-02 15:57:04.286576660 +0200
-@@ -10,7 +10,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/layer1.c   2006-12-20 21:42:34.000000000 +0200
+@@ -10,7 +10,10 @@
  
- static char *l1_revision = "$Revision: 1.1 $";
+ static char *l1_revision = "$Revision: 1.2 $";
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include "layer1.h"
  #include "helper.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/loop.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/loop.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/loop.c        2006-03-23 15:56:11.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/loop.c     2006-12-02 15:57:16.639348659 +0200
-@@ -25,7 +25,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/loop.c     2006-12-20 21:42:25.000000000 +0200
+@@ -25,7 +25,10 @@
  
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/delay.h>
  
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/memdbg.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/memdbg.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/memdbg.c      2006-03-07 14:21:06.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/memdbg.c   2006-12-02 15:56:58.514215910 +0200
-@@ -1,5 +1,5 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/memdbg.c   2006-12-20 21:42:05.000000000 +0200
+@@ -1,5 +1,8 @@
  #include <linux/stddef.h>
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/list.h>
  #include <linux/slab.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/netjet.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/netjet.c      2006-10-09 14:28:41.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/netjet.c   2006-12-02 15:57:48.401333659 +0200
-@@ -7,7 +7,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/netjet.c   2006-12-20 21:43:40.000000000 +0200
+@@ -7,7 +7,10 @@
   * Based on HiSax NETJet driver by Karsten Keil
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/pci.h>
  #include <linux/delay.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/sedl_fax.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/sedl_fax.c    2006-07-03 12:16:08.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/sedl_fax.c 2006-12-02 15:55:22.724229410 +0200
-@@ -26,7 +26,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/sedl_fax.c 2006-12-20 21:45:15.000000000 +0200
+@@ -26,7 +26,10 @@
   * the firmware onto the card.
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/pci.h>
  #include <linux/delay.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/socket.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/socket.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/socket.c      2006-03-07 14:21:06.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/socket.c   2006-12-02 15:56:05.806921909 +0200
-@@ -22,7 +22,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/socket.c   2006-12-20 21:43:15.000000000 +0200
+@@ -22,7 +22,10 @@
  
  
  #include <linux/vmalloc.h>
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/in.h>
  #include <net/sock.h>
  
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/udevice.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/udevice.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/udevice.c     2006-11-02 11:40:53.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/udevice.c  2006-12-02 15:57:23.087751659 +0200
-@@ -8,7 +8,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/udevice.c  2006-12-20 21:42:49.000000000 +0200
+@@ -8,7 +8,10 @@
  #include <linux/stddef.h>
  #include <linux/poll.h>
  #include <linux/vmalloc.h>
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/timer.h>
  #ifdef CONFIG_DEVFS_FS
  #include <linux/devfs_fs_kernel.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/w6692.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/w6692.c       2006-07-03 12:16:08.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/w6692.c    2006-12-02 15:56:38.408959409 +0200
-@@ -21,7 +21,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/w6692.c    2006-12-20 21:41:30.000000000 +0200
+@@ -21,7 +21,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/pci.h>
  #include <linux/delay.h>
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_dte.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_dte.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_dte.c     2006-07-03 12:16:08.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_dte.c  2006-12-02 15:55:06.031186160 +0200
-@@ -12,7 +12,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_dte.c  2006-12-20 21:44:28.000000000 +0200
+@@ -12,7 +12,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include "x25_l3.h"
  #include "helper.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_l3.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_l3.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/x25_l3.c      2006-08-08 12:18:44.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_l3.c   2006-12-02 15:56:45.277388660 +0200
-@@ -12,7 +12,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/x25_l3.c   2006-12-20 21:42:56.000000000 +0200
+@@ -12,7 +12,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include "x25_l3.h"
  #include "helper.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c 2006-03-23 13:39:23.000000000 +0200
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c      2006-12-02 15:56:25.164131660 +0200
-@@ -21,7 +21,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c      2006-12-20 21:44:10.000000000 +0200
+@@ -21,7 +21,10 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/delay.h>
  #include "xhfc_su.h"
 diff -Nru mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_su.c
 --- mISDN-1_0_4.orig/drivers/isdn/hardware/mISDN/xhfc_su.c     2006-09-13 16:58:02.000000000 +0300
-+++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_su.c  2006-12-02 15:54:59.522779410 +0200
-@@ -51,7 +51,7 @@
++++ mISDN-1_0_4/drivers/isdn/hardware/mISDN/xhfc_su.c  2006-12-20 21:44:56.000000000 +0200
+@@ -51,7 +51,10 @@
   */
   
  #include <linux/mISDNif.h>
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
  #include <linux/module.h>
  #include <linux/delay.h>
  #include <linux/pci.h>