ath9k: merge fixes from r25204, r25205

[openwrt-10.03/.git] / package / pcmcia-cs / patches / 003-cardmgr_c.patch

diff --git a/package/pcmcia-cs/patches/003-cardmgr_c.patch b/package/pcmcia-cs/patches/003-cardmgr_c.patch
index 7078db7f78bce7276ebf314507bd1c98609cb51e..716a0b26b9b603024b1d4f1551e437c43c8d12de 100644 (file)
--- a/package/pcmcia-cs/patches/003-cardmgr_c.patch
+++ b/package/pcmcia-cs/patches/003-cardmgr_c.patch
@@ -1,7 +1,6 @@
-diff -urN pcmcia-cs-3.2.8-old/cardmgr/cardmgr.c pcmcia-cs-3.2.8-new/cardmgr/cardmgr.c
---- pcmcia-cs-3.2.8-old/cardmgr/cardmgr.c      2004-05-21 08:39:36.000000000 +0200
-+++ pcmcia-cs-3.2.8-new/cardmgr/cardmgr.c      2006-03-29 20:27:03.000000000 +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 ");
@@ -13,7 +12,7 @@ diff -urN pcmcia-cs-3.2.8-old/cardmgr/cardmgr.c pcmcia-cs-3.2.8-new/cardmgr/card
      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) {
@@ -29,7 +28,7 @@ diff -urN pcmcia-cs-3.2.8-old/cardmgr/cardmgr.c pcmcia-cs-3.2.8-new/cardmgr/card
      }
  }
  
-@@ -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++) {