rpms/em8300-kmod/F-7 em8300-kmod-0.16.3-2623.patch, NONE, 1.1 em8300-kmod.spec, 1.44, 1.45

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/em8300-kmod/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7466

Modified Files:
	em8300-kmod.spec 
Added Files:
	em8300-kmod-0.16.3-2623.patch 
Log Message:
* Mon Oct 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-3
- Fix build with 2.6.23 kernels, build for 2.6.23.1-10.fc7.


em8300-kmod-0.16.3-2623.patch:

--- NEW FILE em8300-kmod-0.16.3-2623.patch ---
Index: modules/em8300_ioctl.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
retrieving revision 1.54
diff -u -r1.54 em8300_ioctl.c
--- modules/em8300_ioctl.c	2 Mar 2007 23:00:35 -0000	1.54
+++ modules/em8300_ioctl.c	21 Aug 2007 21:53:35 -0000
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/wait.h>
+#include <linux/ioctl.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
Index: modules/em8300_ioctl32.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl32.c,v
retrieving revision 1.5
diff -u -r1.5 em8300_ioctl32.c
--- modules/em8300_ioctl32.c	10 Apr 2006 22:31:14 -0000	1.5
+++ modules/em8300_ioctl32.c	21 Aug 2007 21:53:35 -0000
@@ -32,6 +32,7 @@
 #include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <linux/fs.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-7/em8300-kmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- em8300-kmod.spec	28 Sep 2007 22:36:54 -0000	1.44
+++ em8300-kmod.spec	29 Oct 2007 19:59:31 -0000	1.45
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.22.9-91.fc7}
+%{!?kversion: %define kversion 2.6.23.1-10.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -32,13 +32,14 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.3
-Release:        2.%(echo %{kverrel} | tr - _)
+Release:        3.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPLv2+
 URL:            http://dxr3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
+Patch1:         %{name}-0.16.3-2623.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:    i386
@@ -52,6 +53,7 @@
 %setup -q -c
 cd %{kmod_name}-%{version}%{?prever}
 %patch0 -p0
+%patch1 -p0
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}%{?prever} _kmod_build_$kvariant
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Mon Oct 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-3
+- Fix build with 2.6.23 kernels, build for 2.6.23.1-10.fc7.
+
 * Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.22.9-91.fc7.