aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 14:29:20 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 14:29:20 +0000
commitf203206414ad3dd3bdcec4d5a9686eeb500503b0 (patch)
treef86dae2b7ebd709a6a4dfb796c7c6794f45f73f0
parentcbc22ae4c7798a45a8054584169041d967bd72e9 (diff)
downloadmaster-187ad058-f203206414ad3dd3bdcec4d5a9686eeb500503b0.tar.gz
master-187ad058-f203206414ad3dd3bdcec4d5a9686eeb500503b0.tar.bz2
master-187ad058-f203206414ad3dd3bdcec4d5a9686eeb500503b0.zip
package/pcmcia-cs: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20475 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/pcmcia-cs/patches/001-config-novatel_merlin_u630.patch8
-rw-r--r--package/pcmcia-cs/patches/002-serial-cardctl_path.patch8
-rw-r--r--package/pcmcia-cs/patches/003-cardmgr_c.patch12
-rw-r--r--package/pcmcia-cs/patches/004-pcmcia_resources.patch6
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 c9dca5b72c..0d1b133393 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 8eaf02a609..ec8603224d 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 c5c100c628..716a0b26b9 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 ce8653746f..4ce0de20be 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 @@
#