diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-10-11 17:20:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-10-11 17:20:26 +0000 |
| commit | ea7da1dd061b7ef4eabd61c6073e6a27709fe972 (patch) | |
| tree | 46f9ce0ed02ec3fc4d82b3e660d7a3a81627243a /openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8 | |
| parent | 42974a1e1288e787cb4d5bb66acba691b06209ca (diff) | |
| download | openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.gz openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.bz2 openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.xz openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.zip | |
More merging with OE. Fix settings-daemon depends.
git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8')
| -rw-r--r-- | openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch index e78d0c5c6..541c4edf7 100644 --- a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch +++ b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch @@ -1,14 +1,11 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra +++ pcmcia-cs-3.2.8/etc/rc.pcmcia -@@ -105,10 +105,16 @@ +@@ -104,11 +104,17 @@ for x in "1" ; do + (/sbin/modprobe yenta_socket >/dev/null 2>&1 && echo "using yenta_socket instead of $PCIC") || /sbin/modprobe $PCIC $PCIC_OPTS || break - /sbin/modprobe ds || break +- /sbin/modprobe ds || break ++ /sbin/modprobe $DS || break + if [ "x$PCIC_EXTRA" != "x" ]; then + /sbin/modprobe $PCIC_EXTRA + fi @@ -22,7 +19,7 @@ else echo "module directory $PC not found." break -@@ -154,7 +160,7 @@ +@@ -154,7 +160,7 @@ for x in "1" ; do ;; status) |