diff --git a/lirc-2.6.24.diff b/lirc-2.6.24.diff new file mode 100644 index 0000000..14075dd --- /dev/null +++ b/lirc-2.6.24.diff @@ -0,0 +1,57 @@ +--- drivers/lirc_dev/lirc_dev.c ++++ drivers/lirc_dev/lirc_dev.c +@@ -242,7 +242,8 @@ + #ifdef LIRC_HAVE_DEVFS_24 + char name[16]; + #endif +- DECLARE_MUTEX_LOCKED(tn); ++ struct semaphore tn; ++ sema_init(&tn,0); + + if (!p) { + printk("lirc_dev: lirc_register_plugin: " +@@ -431,8 +432,9 @@ + int lirc_unregister_plugin(int minor) + { + struct irctl *ir; +- DECLARE_MUTEX_LOCKED(tn); +- DECLARE_MUTEX_LOCKED(tn2); ++ struct semaphore tn, tn2; ++ sema_init(&tn, 0); ++ sema_init(&tn2, 0); + + if (minor < 0 || minor >= MAX_IRCTL_DEVICES) { + printk("lirc_dev: lirc_unregister_plugin: " +--- drivers/lirc_it87/lirc_it87.c ++++ drivers/lirc_it87/lirc_it87.c +@@ -934,7 +934,7 @@ + /* Leaving MB PnP Mode */ + it87_write(IT87_CFGCTRL, 0x2); + +- retval = request_irq(irq, it87_interrupt, 0 /*SA_INTERRUPT*/, ++ retval = request_irq(irq, it87_interrupt, 0 /*IRQF_DISABLED*/, + LIRC_DRIVER_NAME, NULL); + if (retval < 0) { + printk(KERN_ERR LIRC_DRIVER_NAME +--- drivers/lirc_serial/lirc_serial.c ++++ drivers/lirc_serial/lirc_serial.c +@@ -998,7 +998,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) +--- drivers/lirc_sir/lirc_sir.c ++++ drivers/lirc_sir/lirc_sir.c +@@ -1051,7 +1051,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 diff --git a/lirc-kernel.changes b/lirc-kernel.changes index 80e8ddc..fcf1191 100644 --- a/lirc-kernel.changes +++ b/lirc-kernel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 27 17:14:36 CET 2007 - ro@suse.de + +- fix build with 2.6.24 + ------------------------------------------------------------------- Thu Oct 18 19:08:05 CEST 2007 - ro@suse.de diff --git a/lirc-kernel.spec b/lirc-kernel.spec index 7b2fa38..2b5c022 100644 --- a/lirc-kernel.spec +++ b/lirc-kernel.spec @@ -17,13 +17,14 @@ License: GPL v2 or later Group: System/Kernel Summary: LIRC kernel modules Version: 0.8.2 -Release: 2 +Release: 3 Source0: lirc-0.8.2.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub Patch: lirc-0.8.1-kernel_SLAB_ATOMIC.diff Patch1: lirc-0.8.1-imon_pad2keys.patch Patch2: lirc-2.6.23.diff +Patch3: lirc-2.6.24.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %suse_kernel_module_package -n lirc kdump um debug @@ -51,6 +52,7 @@ popd #%patch -p1 %patch1 -p1 %patch2 -p0 +%patch3 -p0 autoreconf -f -i ./configure --with-driver=all cp -a drivers source @@ -78,7 +80,10 @@ for flavor in %flavors_to_build; do make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ M=$PWD/obj/$flavor done + %changelog +* Tue Nov 27 2007 - ro@suse.de +- fix build with 2.6.24 * Thu Oct 18 2007 - ro@suse.de - fix build with 2.6.23 * Fri Aug 10 2007 - lnussel@suse.de diff --git a/lirc.spec b/lirc.spec index 37dc2f2..a363614 100644 --- a/lirc.spec +++ b/lirc.spec @@ -20,7 +20,7 @@ License: GPL v2 or later Group: Hardware/Other AutoReqProv: on Version: 0.8.2 -Release: 20 +Release: 32 PreReq: %fillup_prereq Summary: Tools for Infrared Receivers Source0: lirc-0.8.2.tar.bz2 @@ -153,6 +153,7 @@ install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf %clean rm -rf %{buildroot} + %changelog * Fri Aug 10 2007 - lnussel@suse.de - upgrade to 0.8.2 final, just minor changes