From 5d0953365fddfa36b028ae760b8edeaa7615424a Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Wed, 23 Aug 2006 17:34:19 +0000
Subject: [PATCH] Add kernheaders patch to fix linux/compiler.h inclusion.

---
 qemu-0.8.2-kernheaders.patch | 11 +++++++++++
 qemu.spec                    |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 qemu-0.8.2-kernheaders.patch

diff --git a/qemu-0.8.2-kernheaders.patch b/qemu-0.8.2-kernheaders.patch
new file mode 100644
index 0000000..10f03f0
--- /dev/null
+++ b/qemu-0.8.2-kernheaders.patch
@@ -0,0 +1,11 @@
+diff -Naupr qemu-0.8.2.orig/usb-linux.c qemu-0.8.2/usb-linux.c
+--- qemu-0.8.2.orig/usb-linux.c	2006-07-22 19:23:34.000000000 +0200
++++ qemu-0.8.2/usb-linux.c	2006-08-23 18:47:16.000000000 +0200
+@@ -26,7 +26,6 @@
+ #if defined(__linux__)
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+-#include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ #include <linux/version.h>
+ 
diff --git a/qemu.spec b/qemu.spec
index 263af66..4a8b4dc 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -9,6 +9,7 @@ Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
+Patch2: qemu-0.8.2-kernheaders.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-34 zlib-devel which texi2html
 Requires(post): /sbin/chkconfig
@@ -33,6 +34,7 @@ As QEMU requires no host kernel patches to run, it is safe and easy to use.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \
@@ -92,6 +94,7 @@ fi
 - Add which build requirement.
 - Don't include texi files in %%doc since we ship them in html.
 - Switch to using gcc34 on devel, FC5 still has gcc32.
+- Add kernheaders patch to fix linux/compiler.h inclusion.
 
 * Thu Jun  8 2006 David Woodhouse <dwmw2@infradead.org> 0.8.1-3
 - More header abuse in modify_ldt(), change BuildRoot: