Package: lirc-modules-source Version: 0.8.0-9 Tags: patch Linux kernels > 2.6.18 have removed the <linux/config.h> include file and replaced it with <linux/autoconf.h>, so the LIRC kernel modules no longer compile.
I've attached a patch (but I've tested it only for the atiusb module, which is the only device I use). Also, this patch is against the modules/ tree contained in the /usr/src/lirc-modules.tar.gz tarball, not against the lirc-modules-source package itself. -- Eric Cooper e c c @ c m u . e d u
diff -Naur modules-orig/lirc/drivers/lirc_atiusb/lirc_atiusb.c modules/lirc/drivers/lirc_atiusb/lirc_atiusb.c --- modules-orig/lirc/drivers/lirc_atiusb/lirc_atiusb.c 2006-11-03 15:21:08.000000000 -0500 +++ modules/lirc/drivers/lirc_atiusb/lirc_atiusb.c 2006-11-23 16:22:08.000000000 -0500 @@ -39,7 +39,11 @@ #error "*******************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/kernel.h> #include <linux/errno.h> diff -Naur modules-orig/lirc/drivers/lirc_bt829/lirc_bt829.c modules/lirc/drivers/lirc_bt829/lirc_bt829.c --- modules-orig/lirc/drivers/lirc_bt829/lirc_bt829.c 2005-11-27 06:03:01.000000000 -0500 +++ modules/lirc/drivers/lirc_bt829/lirc_bt829.c 2006-11-23 15:21:40.000000000 -0500 @@ -23,7 +23,11 @@ #error "This driver needs kernel version 2.4.0 or higher" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/kernel.h> #include <linux/module.h> #include <linux/threads.h> diff -Naur modules-orig/lirc/drivers/lirc_cmdir/lirc_cmdir.c modules/lirc/drivers/lirc_cmdir/lirc_cmdir.c --- modules-orig/lirc/drivers/lirc_cmdir/lirc_cmdir.c 2005-09-25 08:03:39.000000000 -0400 +++ modules/lirc/drivers/lirc_cmdir/lirc_cmdir.c 2006-11-23 15:22:12.000000000 -0500 @@ -35,7 +35,11 @@ #error "**********************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/module.h> #include <linux/errno.h> #include <linux/signal.h> diff -Naur modules-orig/lirc/drivers/lirc_dev/lirc_dev.c modules/lirc/drivers/lirc_dev/lirc_dev.c --- modules-orig/lirc/drivers/lirc_dev/lirc_dev.c 2006-11-03 15:21:08.000000000 -0500 +++ modules/lirc/drivers/lirc_dev/lirc_dev.c 2006-11-23 15:22:34.000000000 -0500 @@ -32,7 +32,11 @@ #error "**********************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/module.h> #include <linux/kernel.h> #include <linux/sched.h> diff -Naur modules-orig/lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c modules/lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c --- modules-orig/lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-11-23 15:23:31.000000000 -0500 @@ -47,7 +47,11 @@ #error "*******************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/module.h> #include <linux/kernel.h> #include <linux/kmod.h> diff -Naur modules-orig/lirc/drivers/lirc_imon/lirc_imon.c modules/lirc/drivers/lirc_imon/lirc_imon.c --- modules-orig/lirc/drivers/lirc_imon/lirc_imon.c 2006-11-03 15:21:08.000000000 -0500 +++ modules/lirc/drivers/lirc_imon/lirc_imon.c 2006-11-23 15:24:01.000000000 -0500 @@ -49,7 +49,11 @@ #error "*** Sorry, this driver requires kernel version 2.4.22 or higher" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/errno.h> #include <linux/init.h> diff -Naur modules-orig/lirc/drivers/lirc_it87/lirc_it87.c modules/lirc/drivers/lirc_it87/lirc_it87.c --- modules-orig/lirc/drivers/lirc_it87/lirc_it87.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_it87/lirc_it87.c 2006-11-23 15:24:20.000000000 -0500 @@ -38,7 +38,11 @@ # include <config.h> #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/sched.h> diff -Naur modules-orig/lirc/drivers/lirc_mceusb/lirc_mceusb.c modules/lirc/drivers/lirc_mceusb/lirc_mceusb.c --- modules-orig/lirc/drivers/lirc_mceusb/lirc_mceusb.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_mceusb/lirc_mceusb.c 2006-11-23 15:28:11.000000000 -0500 @@ -88,7 +88,12 @@ * */ +#include <linux/version.h> +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/kernel.h> #include <linux/errno.h> #include <linux/init.h> diff -Naur modules-orig/lirc/drivers/lirc_mceusb2/lirc_mceusb2.c modules/lirc/drivers/lirc_mceusb2/lirc_mceusb2.c --- modules-orig/lirc/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-11-23 15:24:54.000000000 -0500 @@ -37,7 +37,11 @@ #error "*******************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/kernel.h> #include <linux/errno.h> diff -Naur modules-orig/lirc/drivers/lirc_parallel/lirc_parallel.c modules/lirc/drivers/lirc_parallel/lirc_parallel.c --- modules-orig/lirc/drivers/lirc_parallel/lirc_parallel.c 2005-09-22 16:10:37.000000000 -0400 +++ modules/lirc/drivers/lirc_parallel/lirc_parallel.c 2006-11-23 15:28:51.000000000 -0500 @@ -40,7 +40,11 @@ #error "**********************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #ifdef CONFIG_SMP #error "--- Sorry, this driver is not SMP safe. ---" @@ -50,7 +54,6 @@ #include <linux/sched.h> #include <linux/errno.h> #include <linux/signal.h> -#include <linux/config.h> #include <linux/fs.h> #include <linux/kernel.h> #include <linux/ioport.h> diff -Naur modules-orig/lirc/drivers/lirc_sasem/lirc_sasem.c modules/lirc/drivers/lirc_sasem/lirc_sasem.c --- modules-orig/lirc/drivers/lirc_sasem/lirc_sasem.c 2006-11-03 15:21:08.000000000 -0500 +++ modules/lirc/drivers/lirc_sasem/lirc_sasem.c 2006-11-23 15:25:54.000000000 -0500 @@ -58,7 +58,11 @@ #error "*** Sorry, this driver requires kernel version 2.4.22 or higher" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/errno.h> #include <linux/init.h> diff -Naur modules-orig/lirc/drivers/lirc_serial/lirc_serial.c modules/lirc/drivers/lirc_serial/lirc_serial.c --- modules-orig/lirc/drivers/lirc_serial/lirc_serial.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_serial/lirc_serial.c 2006-11-23 15:26:13.000000000 -0500 @@ -61,7 +61,11 @@ #error "**********************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #if defined(CONFIG_SERIAL) || defined(CONFIG_SERIAL_8250) #warning "******************************************" diff -Naur modules-orig/lirc/drivers/lirc_sir/lirc_sir.c modules/lirc/drivers/lirc_sir/lirc_sir.c --- modules-orig/lirc/drivers/lirc_sir/lirc_sir.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_sir/lirc_sir.c 2006-11-23 15:26:38.000000000 -0500 @@ -46,7 +46,11 @@ # include <config.h> #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #if !defined(LIRC_ON_SA1100) && !defined(CONFIG_SERIAL_MODULE) #warning "******************************************" diff -Naur modules-orig/lirc/drivers/lirc_streamzap/lirc_streamzap.c modules/lirc/drivers/lirc_streamzap/lirc_streamzap.c --- modules-orig/lirc/drivers/lirc_streamzap/lirc_streamzap.c 2006-11-03 15:21:07.000000000 -0500 +++ modules/lirc/drivers/lirc_streamzap/lirc_streamzap.c 2006-11-23 15:26:57.000000000 -0500 @@ -38,7 +38,11 @@ #error "*******************************************************" #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif #include <linux/kernel.h> #include <linux/errno.h> #include <linux/init.h>
