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

(Portage version: 2.1.1-r2)

2 files changed, 139 insertions, 69 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index e5d3fdd88d30..b2eaca8f6c4e 100644
--- 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/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 eb0c46a2d348..c0b05d4424a6 100644
--- 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>