[arch-commits] CVS update of extra/network/intel-537-suspend2 (3 files)

[Thomas Baechler]

    Date: Tuesday, May 8, 2007 @ 17:30:47
  Author: thomas
    Path: /home/cvs-extra/extra/network/intel-537-suspend2

   Added: kernel-2.6.20.patch (1.1)
Modified: PKGBUILD (1.2 -> 1.3) intel-537.install (1.2 -> 1.3)

upgpkg: intel-537-suspend2 2.60.80.0-3


---------------------+
 PKGBUILD            |   11 ++++++-----
 intel-537.install   |    4 ++--
 kernel-2.6.20.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)


Index: extra/network/intel-537-suspend2/PKGBUILD
diff -u extra/network/intel-537-suspend2/PKGBUILD:1.2 extra/network/intel-537-suspend2/PKGBUILD:1.3
--- extra/network/intel-537-suspend2/PKGBUILD:1.2	Sat Dec  2 10:43:24 2006
+++ extra/network/intel-537-suspend2/PKGBUILD	Tue May  8 17:30:47 2007
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD,v 1.2 2006/12/02 15:43:24 thomas Exp $
+# $Id: PKGBUILD,v 1.3 2007/05/08 21:30:47 thomas Exp $
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
-_kernver=2.6.19-suspend2
+_kernver=2.6.21-suspend2
 
 pkgname=intel-537-suspend2
 pkgver=2.60.80.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Intel Modem Drivers for 537 chipsets. For kernel26suspend2."
 arch=(i686 x86_64)
 url="http://linmodems.technion.ac.il/packages/Intel/"
 depends=('intel-537-utils' 'kernel26suspend2')
 source=(ftp://aiedownload.intel.com/df-support/9284/eng/Intel-537EP-2.70.95.0-suse9.3.tgz flip.patch compile.patch \
-	module-parm.patch pm_unregister.patch asmlinkage.patch kernel-2.6.19.patch)
+	module-parm.patch pm_unregister.patch asmlinkage.patch kernel-2.6.19.patch kernel-2.6.20.patch)
 install=intel-537.install
 md5sums=('1740a05c0ce039633f2dd65b055604b0' 'c459529b418a72d810f1c17b74ad24ac'\
          '2cea9fefc9844518f40a55f0c26a4714' '24cdd2988a87075a4cb3a5de0ea118d5'\
          '4925209a57fcf7994d4436629f50a4da' '288aa5d8fb6817c5de2119c6c8d3f27a'\
-         '63bc7e293d012e5c6f6110c992da14a2')
+         '63bc7e293d012e5c6f6110c992da14a2' 'dfa22d3419daf52bd85c258702bcee3d')
 
 build() {
   cd $startdir/src/Intel-537
@@ -26,6 +26,7 @@
   patch -Np1 -i ../pm_unregister.patch || return 1
   patch -Np1 -i ../asmlinkage.patch || return 1
   patch -Np0 -i ../kernel-2.6.19.patch || return 1
+  patch -Np0 -i ../kernel-2.6.20.patch || return 1
   # fix makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check
Index: extra/network/intel-537-suspend2/intel-537.install
diff -u extra/network/intel-537-suspend2/intel-537.install:1.2 extra/network/intel-537-suspend2/intel-537.install:1.3
--- extra/network/intel-537-suspend2/intel-537.install:1.2	Sat Dec  2 10:43:25 2006
+++ extra/network/intel-537-suspend2/intel-537.install	Tue May  8 17:30:47 2007
@@ -19,7 +19,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.19-suspend2
+  KERNEL_VERSION=2.6.21-suspend2
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 echo
 echo
@@ -41,7 +41,7 @@
   rm /etc/hamregistry.bin
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.19-suspend2
+  KERNEL_VERSION=2.6.21-suspend2
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
Index: extra/network/intel-537-suspend2/kernel-2.6.20.patch
diff -u /dev/null extra/network/intel-537-suspend2/kernel-2.6.20.patch:1.1
--- /dev/null	Tue May  8 17:30:47 2007
+++ extra/network/intel-537-suspend2/kernel-2.6.20.patch	Tue May  8 17:30:47 2007
@@ -0,0 +1,49 @@
+--- coredrv/coredrv.c~	2007-01-08 22:46:01.000000000 +0100
++++ coredrv/coredrv.c	2007-01-08 22:49:52.000000000 +0100
+@@ -767,8 +767,8 @@
+       timeout1 = wait_event_interruptible_timeout(persistReadQ, 0, timeout1);
+    }
+ }
+-DECLARE_WORK(wait_wq2, WakeTask2, NULL);
+-DECLARE_WORK(wait_wq, WakeTask, NULL);
++DECLARE_WORK(wait_wq2, WakeTask2);
++DECLARE_WORK(wait_wq, WakeTask);
+ #endif
+ 
+ asmlinkage void wake_up_interruptible_persistWriteQ(void)
+--- coredrv/rts.c~	2005-07-26 17:59:33.000000000 +0200
++++ coredrv/rts.c	2007-01-08 22:53:13.000000000 +0100
+@@ -77,7 +77,7 @@
+ };
+ #else
+ //DECLARE_TASKLET(rs_tasklet, RTS_Task, 0);
+-static DECLARE_WORK(rs_wq, RTS_Task, 0);
++static DECLARE_WORK(rs_wq, RTS_Task);
+ 
+ #endif
+ 
+--- coredrv/softserial.c~	2005-07-26 17:59:33.000000000 +0200
++++ coredrv/softserial.c	2007-01-08 22:55:30.000000000 +0100
+@@ -188,8 +188,7 @@
+ static struct async_struct softserial_async;
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
+ DECLARE_WORK(softserial_bg_event_work,
+-             softserial_background_event_handler,
+-             &softserial_async);
++             softserial_background_event_handler);
+ #endif
+ static struct serial_state state = {0,BASE_BAUD,-1,0,ASYNC_SPD_VHI | ASYNC_SKIP_TEST};
+ int softserial_open(struct tty_struct* ptty, struct file* pfile)
+--- coredrv/afedsp_int.c~	2005-07-26 19:59:56.000000000 +0200
++++ coredrv/afedsp_int.c	2007-01-08 23:03:19.000000000 +0100
+@@ -57,8 +57,8 @@
+ };
+ DECLARE_TASKLET(sound_tasklet, sound_function, NULL);
+ #else
+-DECLARE_WORK(prec_wq, Precdialer_Task, 0);
+-DECLARE_WORK(sound_wq, sound_function, 0);
++DECLARE_WORK(prec_wq, Precdialer_Task);
++DECLARE_WORK(sound_wq, sound_function);
+ #endif
+ 
+ asmlinkage void schedule_precdialer()