rpms/em8300-kmod/F-8 em8300-kmod-0.16.3-2624.patch, NONE, 1.1 em8300-kmod.spec, 1.49, 1.50

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec 
Added Files:
	em8300-kmod-0.16.3-2624.patch 
Log Message:
* Thu Mar  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-7
- Backport upstream kernel 2.6.24 compat changes to 0.16.3
  (not upgrading to 0.16.4 at least yet due to lack of WSS patches for it).
- Build for kernel 2.6.24.3-12.fc8.


em8300-kmod-0.16.3-2624.patch:

--- NEW FILE em8300-kmod-0.16.3-2624.patch ---
Index: em8300/modules/em8300_compat24.h
diff -u em8300/modules/em8300_compat24.h:1.5 em8300/modules/em8300_compat24.h:1.6
--- em8300/modules/em8300_compat24.h:1.5	Mon Apr 10 15:31:14 2006
+++ em8300/modules/em8300_compat24.h	Mon Dec  3 14:59:09 2007
@@ -1,4 +1,4 @@
-/* $Id: em8300_compat24.h,v 1.5 2006/04/10 22:31:14 nboullis Exp $
+/* $Id: em8300_compat24.h,v 1.6 2007/12/03 22:59:09 nboullis Exp $
  *
  * em8300_compat24.h -- compatibility layer for 2.4 and some 2.5 kernels
  * Copyright (C) 2004 Andreas Schultz <aschultz at warp10.net>
@@ -30,6 +30,15 @@
 typedef void irqreturn_t;
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#ifndef IRQF_DISABLED
+#define IRQF_DISABLED SA_INTERRUPT
+#endif
+#ifndef IRQF_SHARED
+#define IRQF_SHARED SA_SHIRQ
+#endif
+#endif
+
 /* i2c stuff */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,67)
 static inline void *i2c_get_clientdata(struct i2c_client *dev)
Index: em8300/modules/em8300_main.c
diff -u em8300/modules/em8300_main.c:1.132 em8300/modules/em8300_main.c:1.133
--- em8300/modules/em8300_main.c:1.132	Sun Jun 17 16:04:21 2007
+++ em8300/modules/em8300_main.c	Mon Dec  3 14:59:09 2007
@@ -686,7 +686,7 @@
 	init_waitqueue_head(&em->vbi_wait);
 	init_waitqueue_head(&em->sp_ptsfifo_wait);
 
-	result = request_irq(dev->irq, em8300_irq, SA_SHIRQ | SA_INTERRUPT, "em8300", (void *) em);
+	result = request_irq(dev->irq, em8300_irq, IRQF_SHARED | IRQF_DISABLED, "em8300", (void *) em);
 
 	if (result == -EINVAL) {
 		printk(KERN_ERR "em8300: Bad irq number or handler\n");


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/F-8/em8300-kmod.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- em8300-kmod.spec	11 Feb 2008 22:49:43 -0000	1.49
+++ em8300-kmod.spec	6 Mar 2008 21:34:36 -0000	1.50
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23.15-137.fc8}
+%{!?kversion: %define kversion 2.6.24.3-12.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:        6.%(echo %{kverrel} | tr - _)
+Release:        7.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPLv2+
@@ -33,6 +33,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:         %{name}-0.16.3-2623.patch
+Patch2:         %{name}-0.16.3-2624.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:    i386 i586
@@ -47,6 +48,7 @@
 cd %{kmod_name}-%{version}%{?prever}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 cd ..
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}%{?prever} _kmod_build_$kvariant
@@ -79,6 +81,11 @@
 
 
 %changelog
+* Thu Mar  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-7
+- Backport upstream kernel 2.6.24 compat changes to 0.16.3
+  (not upgrading to 0.16.4 at least yet due to lack of WSS patches for it).
+- Build for kernel 2.6.24.3-12.fc8.
+
 * Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.23.15-137.fc8.