packages: zd1211/zd1211.spec, zd1211/zd1211-2.6.30.patch (NEW) - rel 7; wit...

[cactus]

Author: cactus                       Date: Fri Aug 28 12:38:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; with 2.6.30 patch

---- Files affected:
packages/zd1211:
   zd1211.spec (1.42 -> 1.43) , zd1211-2.6.30.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zd1211/zd1211.spec
diff -u packages/zd1211/zd1211.spec:1.42 packages/zd1211/zd1211.spec:1.43
--- packages/zd1211/zd1211.spec:1.42	Wed Apr  1 20:12:46 2009
+++ packages/zd1211/zd1211.spec	Fri Aug 28 14:37:59 2009
@@ -21,7 +21,7 @@
 %endif
 
 %define		zd1211_name	zd1211-driver-r85
-%define		rel		6
+%define		rel		7
 %define		pname	zd1211
 Summary:	Linux driver for USB WLAN cards based on zd1211
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart bezprzewodowych USB opartych na układzie zd1211
@@ -37,6 +37,7 @@
 Patch2:		%{pname}-2.6.22.patch
 Patch3:		%{pname}-2.6.27.patch
 Patch4:		%{pname}-2.6.29.patch
+Patch5:		%{pname}-2.6.30.patch
 URL:		http://zd1211.ath.cx/
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.27}
 BuildRequires:	rpmbuild(macros) >= 1.330
@@ -82,6 +83,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %build_kernel_modules -m zd1211
@@ -109,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2009/08/28 12:37:59  cactus
+- rel 7; with 2.6.30 patch
+
 Revision 1.42  2009/04/01 18:12:46  zbyniu
 - patch for .29; rel 6
 

================================================================
Index: packages/zd1211/zd1211-2.6.30.patch
diff -u /dev/null packages/zd1211/zd1211-2.6.30.patch:1.1
--- /dev/null	Fri Aug 28 14:38:04 2009
+++ packages/zd1211/zd1211-2.6.30.patch	Fri Aug 28 14:37:59 2009
@@ -0,0 +1,17 @@
+--- zd1211-driver-r85/src/zdcompat.h.orig	2009-08-28 14:24:56.000000000 +0200
++++ zd1211-driver-r85/src/zdcompat.h	2009-08-28 14:31:31.000000000 +0200
+@@ -65,12 +65,14 @@
+ #endif
+ 
+ /* linux < 2.5.69 */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
+ #ifndef IRQ_NONE
+ typedef void irqreturn_t;
+ #define IRQ_NONE
+ #define IRQ_HANDLED
+ #define IRQ_RETVAL(x)
+ #endif
++#endif
+ 
+ #ifndef in_atomic
+ #define in_atomic()  0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zd1211/zd1211.spec?r1=1.42&r2=1.43&f=u