85 lines
2.1 KiB
Diff
85 lines
2.1 KiB
Diff
--- drivers/kcompat.h
|
|
+++ drivers/kcompat.h
|
|
@@ -8,9 +8,10 @@
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
|
|
|
#include <linux/device.h>
|
|
-
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
|
#define LIRC_HAVE_DEVFS
|
|
#define LIRC_HAVE_DEVFS_26
|
|
+#endif
|
|
#define LIRC_HAVE_SYSFS
|
|
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
|
|
--- drivers/lirc_dev/lirc_dev.c
|
|
+++ drivers/lirc_dev/lirc_dev.c
|
|
@@ -49,16 +49,16 @@
|
|
#endif
|
|
#define __KERNEL_SYSCALLS__
|
|
#include <linux/unistd.h>
|
|
+#include "drivers/kcompat.h"
|
|
/* DevFS header */
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
|
|
+#if defined(LIRC_HAVE_DEVFS)
|
|
#include <linux/devfs_fs_kernel.h>
|
|
#endif
|
|
/* SysFS header */
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
|
+#if defined(LIRC_HAVE_SYSFS)
|
|
#include <linux/device.h>
|
|
#endif
|
|
|
|
-#include "drivers/kcompat.h"
|
|
#include "drivers/lirc.h"
|
|
#include "lirc_dev.h"
|
|
|
|
--- drivers/lirc_gpio/lirc_gpio.c
|
|
+++ drivers/lirc_gpio/lirc_gpio.c
|
|
@@ -48,9 +48,12 @@
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
|
|
#include "../drivers/char/bttv.h"
|
|
#include "../drivers/char/bttvp.h"
|
|
-#else
|
|
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
|
|
#include "../drivers/media/video/bttv.h"
|
|
#include "../drivers/media/video/bttvp.h"
|
|
+#else
|
|
+#include "../drivers/media/video/bt8xx/bttv.h"
|
|
+#include "../drivers/media/video/bt8xx/bttvp.h"
|
|
#endif
|
|
|
|
#if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
|
|
--- drivers/lirc_imon/lirc_imon.c
|
|
+++ drivers/lirc_imon/lirc_imon.c
|
|
@@ -58,10 +58,12 @@
|
|
#include <linux/slab.h>
|
|
#include <asm/uaccess.h>
|
|
#include <linux/usb.h>
|
|
+#include "drivers/kcompat.h"
|
|
+#if defined(LIRC_HAVE_DEVFS)
|
|
#include <linux/devfs_fs_kernel.h>
|
|
+#endif
|
|
|
|
#include "drivers/lirc.h"
|
|
-#include "drivers/kcompat.h"
|
|
#include "drivers/lirc_dev/lirc_dev.h"
|
|
|
|
|
|
--- drivers/lirc_sasem/lirc_sasem.c
|
|
+++ drivers/lirc_sasem/lirc_sasem.c
|
|
@@ -67,10 +67,12 @@
|
|
#include <linux/slab.h>
|
|
#include <asm/uaccess.h>
|
|
#include <linux/usb.h>
|
|
+#include "drivers/kcompat.h"
|
|
+#if defined(LIRC_HAVE_DEVFS)
|
|
#include <linux/devfs_fs_kernel.h>
|
|
+#endif
|
|
|
|
#include "drivers/lirc.h"
|
|
-#include "drivers/kcompat.h"
|
|
#include "drivers/lirc_dev/lirc_dev.h"
|
|
|
|
|