rpms/em8300-kmod/F-8 em8300-kmod-0.16.3-2625.patch, NONE, 1.1 em8300-kmod.spec, 1.55, 1.56

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec 
Added Files:
	em8300-kmod-0.16.3-2625.patch 
Log Message:
* Mon Jun  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-8
- Patch for kernel 2.6.25 compatibility (still not upgrading to later
  upstream versions due to lack of WSS patches for them).
- Build for kernel 2.6.25.4-10.fc8.


em8300-kmod-0.16.3-2625.patch:

--- NEW FILE em8300-kmod-0.16.3-2625.patch ---
diff -up em8300-0.16.3/modules/em8300_i2c.c~ em8300-0.16.3/modules/em8300_i2c.c
--- em8300-0.16.3/modules/em8300_i2c.c~	2007-05-20 12:10:39.000000000 +0300
+++ em8300-0.16.3/modules/em8300_i2c.c	2008-06-09 20:12:16.000000000 +0300
@@ -114,9 +114,11 @@ static int em8300_i2c_reg(struct i2c_cli
 		em->encoder_type = ENCODER_BT865;
 		em->encoder = client;
 		break;
+#ifdef I2C_DRIVERID_EEPROM
 	case I2C_DRIVERID_EEPROM:
 		/* do nothing */
 		break;
+#endif
 	default:
 		printk(KERN_ERR "em8300_i2c: unknown client id\n");
 		return -ENODEV;


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-8/em8300-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- em8300-kmod.spec	15 May 2008 05:04:22 -0000	1.55
+++ em8300-kmod.spec	9 Jun 2008 17:24:43 -0000	1.56
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.24.7-92.fc8}
+%{!?kversion: %define kversion 2.6.25.4-10.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -25,7 +25,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.3
-Release:        7.%(echo %{kverrel} | tr - _)
+Release:        8.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPLv2+
@@ -34,6 +34,7 @@
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         %{name}-0.16.3-2623.patch
 Patch2:         %{name}-0.16.3-2624.patch
+Patch3:         %{name}-0.16.3-2625.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:    i386 i586
@@ -49,6 +50,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}%{?prever} _kmod_build_$kvariant
@@ -81,6 +83,11 @@
 
 
 %changelog
+* Mon Jun  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-8
+- Patch for kernel 2.6.25 compatibility (still not upgrading to later
+  upstream versions due to lack of WSS patches for them).
+- Build for kernel 2.6.25.4-10.fc8.
+
 * Thu May 15 2008 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.24.7-92.fc8.