From 08005bf6c9bb0097b592927fb26af25712dbf232 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 26 Mar 2010 14:29:20 +0000
Subject: [PATCH] package/pcmcia-cs: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20475 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../patches/001-config-novatel_merlin_u630.patch     |  8 +++-----
 .../pcmcia-cs/patches/002-serial-cardctl_path.patch  |  8 +++-----
 package/pcmcia-cs/patches/003-cardmgr_c.patch        | 12 +++++-------
 package/pcmcia-cs/patches/004-pcmcia_resources.patch |  6 ++----
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch b/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch
index c9dca5b72..0d1b13339 100644
--- a/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch
+++ b/package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch
@@ -1,8 +1,6 @@
-Index: pcmcia-cs-3.2.8/etc/config
-===================================================================
---- pcmcia-cs-3.2.8.orig/etc/config	2007-06-04 13:23:59.533683400 +0200
-+++ pcmcia-cs-3.2.8/etc/config	2007-06-04 13:23:59.600673216 +0200
-@@ -2413,6 +2413,10 @@
+--- a/etc/config
++++ b/etc/config
+@@ -2413,6 +2413,10 @@ card "Xircom RBM56G Modem"
    pci 0x115d, 0x0101
    bind "serial_cb"
  
diff --git a/package/pcmcia-cs/patches/002-serial-cardctl_path.patch b/package/pcmcia-cs/patches/002-serial-cardctl_path.patch
index 8eaf02a60..ec8603224 100644
--- a/package/pcmcia-cs/patches/002-serial-cardctl_path.patch
+++ b/package/pcmcia-cs/patches/002-serial-cardctl_path.patch
@@ -1,8 +1,6 @@
-Index: pcmcia-cs-3.2.8/etc/shared
-===================================================================
---- pcmcia-cs-3.2.8.orig/etc/shared	2007-06-04 13:23:59.512686592 +0200
-+++ pcmcia-cs-3.2.8/etc/shared	2007-06-04 13:24:00.335561496 +0200
-@@ -167,7 +167,7 @@
+--- a/etc/shared
++++ b/etc/shared
+@@ -167,7 +167,7 @@ get_info ()
  	    STAB=/var/run/stab
  	fi
  	grep_stab $1 < $STAB || usage
diff --git a/package/pcmcia-cs/patches/003-cardmgr_c.patch b/package/pcmcia-cs/patches/003-cardmgr_c.patch
index c5c100c62..716a0b26b 100644
--- a/package/pcmcia-cs/patches/003-cardmgr_c.patch
+++ b/package/pcmcia-cs/patches/003-cardmgr_c.patch
@@ -1,8 +1,6 @@
-Index: pcmcia-cs-3.2.8/cardmgr/cardmgr.c
-===================================================================
---- pcmcia-cs-3.2.8.orig/cardmgr/cardmgr.c	2007-06-04 13:23:59.491689784 +0200
-+++ pcmcia-cs-3.2.8/cardmgr/cardmgr.c	2007-06-04 13:24:00.561527144 +0200
-@@ -739,10 +739,7 @@
+--- a/cardmgr/cardmgr.c
++++ b/cardmgr/cardmgr.c
+@@ -739,10 +739,7 @@ static int try_insmod(char *mod, char *o
      int ret;
  
      strcpy(cmd, "insmod ");
@@ -14,7 +12,7 @@ Index: pcmcia-cs-3.2.8/cardmgr/cardmgr.c
      if (access(cmd+7, R_OK) != 0) {
  	syslog(LOG_NOTICE, "module %s not available", cmd+7);
  	free(cmd);
-@@ -808,11 +805,13 @@
+@@ -808,11 +805,13 @@ static void install_module(char *mod, ch
      }
  
      if (do_modprobe) {
@@ -30,7 +28,7 @@ Index: pcmcia-cs-3.2.8/cardmgr/cardmgr.c
      }
  }
  
-@@ -1113,8 +1112,9 @@
+@@ -1113,8 +1112,9 @@ static void do_remove(int sn)
  
      /* remove kernel modules in inverse order */
      for (i = 0; i < card->bindings; i++) {
diff --git a/package/pcmcia-cs/patches/004-pcmcia_resources.patch b/package/pcmcia-cs/patches/004-pcmcia_resources.patch
index ce8653746..4ce0de20b 100644
--- a/package/pcmcia-cs/patches/004-pcmcia_resources.patch
+++ b/package/pcmcia-cs/patches/004-pcmcia_resources.patch
@@ -1,7 +1,5 @@
-Index: pcmcia-cs-3.2.8/etc/config.opts
-===================================================================
---- pcmcia-cs-3.2.8.orig/etc/config.opts	2007-06-04 13:23:59.471692824 +0200
-+++ pcmcia-cs-3.2.8/etc/config.opts	2007-06-04 13:24:00.759497048 +0200
+--- a/etc/config.opts
++++ b/etc/config.opts
 @@ -17,14 +17,13 @@
  #