rpms/em8300-kmod/devel em8300-0.16.0-2.6.20.patch, NONE, 1.1 em8300-kmod.spec, 1.13, 1.14

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9450

Modified Files:
	em8300-kmod.spec 
Added Files:
	em8300-0.16.0-2.6.20.patch 
Log Message:
* Tue Feb  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-6
- Patch for kernel 2.6.20 (David van Vyfeyken), build for 2.6.20-1.2922.fc7.


em8300-0.16.0-2.6.20.patch:

--- NEW FILE em8300-0.16.0-2.6.20.patch ---
http://thread.gmane.org/gmane.linux.drivers.dxr3.devel/1817

diff -urN em8300-CVS-orig/modules/em8300_i2c.c em8300-CVS/modules/em8300_i2c.c
--- em8300-CVS-orig/modules/em8300_i2c.c	2007-02-04 23:47:33.000000000 +0100
+++ em8300-CVS/modules/em8300_i2c.c	2007-02-04 23:48:31.000000000 +0100
@@ -245,8 +245,13 @@
 	/* unregister i2c_bus */
 	kfree(em->i2c_data_1.data);
 	kfree(em->i2c_data_2.data);
-	i2c_bit_del_bus(&em->i2c_ops_1);
-	i2c_bit_del_bus(&em->i2c_ops_2);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+	i2c_del_adapter(&em->i2c_ops_1);                    
+	i2c_del_adapter(&em->i2c_ops_2);
+#else
+	i2c_bit_del_bus(&em->i2c_ops_1);
+	i2c_bit_del_bus(&em->i2c_ops_2);
+#endif
 }
 
 void em8300_clockgen_write(struct em8300_s *em, int abyte)


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- em8300-kmod.spec	18 Dec 2006 22:11:01 -0000	1.13
+++ em8300-kmod.spec	6 Feb 2007 17:36:53 -0000	1.14
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2868.fc6}
+%{!?kversion: %define kversion 2.6.20-1.2922.fc7}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -27,7 +27,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -35,6 +35,7 @@
 Source0:        http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
+Patch2:         em8300-0.16.0-2.6.20.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  i586 i686 x86_64 ppc
@@ -49,6 +50,7 @@
 cd %{kmod_name}-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
@@ -80,6 +82,9 @@
 
 
 %changelog
+* Tue Feb  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-6
+- Patch for kernel 2.6.20 (David van Vyfeyken), build for 2.6.20-1.2922.fc7.
+
 * Mon Dec 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-5
 - 0.16.0, build for kernel 2.6.18-1.2868.fc6.