Files
@ 0bebd7e0003e
Branch filter:
Location: portage-overlay.git/app-misc/lirc/files/lirc-0.8.4-kernel-2.6.29.patch - annotation
0bebd7e0003e
3.0 KiB
text/x-diff
merge NAS/HTPC tree
0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e 0bebd7e0003e | diff -uprN lirc-0.8.4/drivers/lirc_cmdir/commandir.c lirc-0.8.4-patched/drivers/lirc_cmdir/commandir.c
--- lirc-0.8.4/drivers/lirc_cmdir/commandir.c 2008-05-17 01:02:13.000000000 +0300
+++ lirc-0.8.4-patched/drivers/lirc_cmdir/commandir.c 2009-05-12 07:42:07.000000000 +0300
@@ -42,6 +42,14 @@
#include <linux/uaccess.h>
#endif
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#endif
#define DRIVER_VERSION "v1.1.2"
#define DRIVER_AUTHOR "Evelyn Yeung, InnovationOne"
diff -uprN lirc-0.8.4/drivers/lirc_imon/lirc_imon.c lirc-0.8.4-patched/drivers/lirc_imon/lirc_imon.c
--- lirc-0.8.4/drivers/lirc_imon/lirc_imon.c 2008-08-23 00:38:17.000000000 +0300
+++ lirc-0.8.4-patched/drivers/lirc_imon/lirc_imon.c 2009-05-12 07:42:27.000000000 +0300
@@ -65,6 +65,15 @@
#else
#include <linux/uaccess.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#endif
+
#include <linux/usb.h>
#include "drivers/kcompat.h"
diff -uprN lirc-0.8.4/drivers/lirc_mceusb/lirc_mceusb.c lirc-0.8.4-patched/drivers/lirc_mceusb/lirc_mceusb.c
--- lirc-0.8.4/drivers/lirc_mceusb/lirc_mceusb.c 2008-05-17 01:02:13.000000000 +0300
+++ lirc-0.8.4-patched/drivers/lirc_mceusb/lirc_mceusb.c 2009-05-12 07:44:59.000000000 +0300
@@ -111,6 +111,14 @@
#include <linux/sched.h>
#include <linux/signal.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#endif
#ifdef CONFIG_USB_DEBUG
static int debug = 1;
diff -uprN lirc-0.8.4/drivers/lirc_sasem/lirc_sasem.c lirc-0.8.4-patched/drivers/lirc_sasem/lirc_sasem.c
--- lirc-0.8.4/drivers/lirc_sasem/lirc_sasem.c 2008-05-17 01:02:13.000000000 +0300
+++ lirc-0.8.4-patched/drivers/lirc_sasem/lirc_sasem.c 2009-05-12 07:43:21.000000000 +0300
@@ -72,6 +72,15 @@
#else
#include <linux/uaccess.h>
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
+ format "\n" , ## arg)
+#endif
+
#include <linux/usb.h>
#include "drivers/kcompat.h"
|