summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2007-12-28 14:23:22 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2007-12-28 14:23:22 +0000
commit35fd2d29bf9de63c560ce166d7647b75778e0dc6 (patch)
treea3fa2a25f1e83111553e03f01b56362ee269e9ed /app-misc/lirc/files
parentStep up as new antiword maintainer (diff)
downloadgentoo-2-35fd2d29bf9de63c560ce166d7647b75778e0dc6.tar.gz
gentoo-2-35fd2d29bf9de63c560ce166d7647b75778e0dc6.tar.bz2
gentoo-2-35fd2d29bf9de63c560ce166d7647b75778e0dc6.zip
rewrite patch; bug 200508
(Portage version: 2.1.3.19)
Diffstat (limited to 'app-misc/lirc/files')
-rw-r--r--app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff24
1 files changed, 24 insertions, 0 deletions
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff
index 5b9150bdeece..7216e77eff4b 100644
--- a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff
+++ b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff
@@ -84,3 +84,27 @@
ir->t_notify = NULL;
ir->t_notify2 = NULL;
}
+diff -Naur lirc-0.8.3pre1.orig/drivers/lirc_serial/lirc_serial.c lirc-0.8.3pre1/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.8.3pre1.orig/drivers/lirc_serial/lirc_serial.c 2007-12-27 01:27:36.143803257 +0100
++++ lirc-0.8.3pre1/drivers/lirc_serial/lirc_serial.c 2007-12-27 01:29:38.149303268 +0100
+@@ -961,7 +961,7 @@
+ do_gettimeofday(&lasttv);
+
+ result = request_irq(irq, irq_handler,
+- SA_INTERRUPT | (share_irq ? SA_SHIRQ:0),
++ IRQF_DISABLED | (share_irq ? IRQF_SHARED:0),
+ LIRC_DRIVER_NAME, (void *)&hardware);
+
+ switch (result) {
+diff -Naur lirc-0.8.3pre1.orig/drivers/lirc_sir/lirc_sir.c lirc-0.8.3pre1/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.8.3pre1.orig/drivers/lirc_sir/lirc_sir.c 2007-12-28 15:11:48.142285437 +0100
++++ lirc-0.8.3pre1/drivers/lirc_sir/lirc_sir.c 2007-12-28 15:13:05.561290741 +0100
+@@ -1025,7 +1025,7 @@
+ return -EBUSY;
+ }
+ #endif
+- retval = request_irq(irq, sir_interrupt, SA_INTERRUPT,
++ retval = request_irq(irq, sir_interrupt, IRQF_DISABLED,
+ LIRC_DRIVER_NAME, NULL);
+ if (retval < 0) {
+ # ifndef LIRC_ON_SA1100