rpms/kernel/devel kernel.spec, 1.838, 1.839 linux-2.6-lirc.patch, 1.7, 1.8

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23320

Modified Files:
	kernel.spec linux-2.6-lirc.patch 
Log Message:
* Mon Aug 04 2008 Jarod Wilson <jwilson at redhat.com>
- Make lirc build again



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- kernel.spec	4 Aug 2008 04:26:02 -0000	1.838
+++ kernel.spec	4 Aug 2008 13:32:56 -0000	1.839
@@ -1110,7 +1110,7 @@
 ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
 
 # http://www.lirc.org/
-#ApplyPatch linux-2.6-lirc.patch
+ApplyPatch linux-2.6-lirc.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
@@ -1711,7 +1711,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Mon Aug 04 2008 Dave Airlie <airlied at redhat.com> 
+* Mon Aug 04 2008 Jarod Wilson <jwilson at redhat.com>
+- Make lirc build again
+
+* Mon Aug 04 2008 Dave Airlie <airlied at redhat.com>
 - rebase modesetting patch + fixes
 
 * Sat Aug 02 2008 Dave Jones <davej at redhat.com>

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-lirc.patch	2 Jun 2008 20:41:22 -0000	1.7
+++ linux-2.6-lirc.patch	4 Aug 2008 13:32:56 -0000	1.8
@@ -3964,7 +3964,7 @@
 +#include <linux/completion.h>
 +#include <linux/uaccess.h>
 +#include <linux/errno.h>
-+#include <asm/semaphore.h>
++#include <linux/semaphore.h>
 +#define __KERNEL_SYSCALLS__
 +#include <linux/unistd.h>
 +#include <linux/kthread.h>
@@ -5082,7 +5082,7 @@
 +#include <linux/i2c.h>
 +#include <linux/i2c-algo-bit.h>
 +
-+#include <asm/semaphore.h>
++#include <linux/semaphore.h>
 +
 +#include "kcompat.h"
 +#include "lirc_dev.h"
@@ -11445,7 +11445,7 @@
 +#include <linux/firmware.h>
 +#include <linux/vmalloc.h>
 +
-+#include <asm/semaphore.h>
++#include <linux/semaphore.h>
 +#include <linux/kthread.h>
 +
 +#include "kcompat.h"