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 | |
parent | 42974a1e1288e787cb4d5bb66acba691b06209ca (diff) | |
download | poky-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.gz |
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')
-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 e78d0c5c6b..541c4edf71 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 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra | 1 | --- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra |
7 | +++ pcmcia-cs-3.2.8/etc/rc.pcmcia | 2 | +++ pcmcia-cs-3.2.8/etc/rc.pcmcia |
8 | @@ -105,10 +105,16 @@ | 3 | @@ -104,11 +104,17 @@ for x in "1" ; do |
4 | (/sbin/modprobe yenta_socket >/dev/null 2>&1 && | ||
9 | echo "using yenta_socket instead of $PCIC") || | 5 | echo "using yenta_socket instead of $PCIC") || |
10 | /sbin/modprobe $PCIC $PCIC_OPTS || break | 6 | /sbin/modprobe $PCIC $PCIC_OPTS || break |
11 | /sbin/modprobe ds || break | 7 | - /sbin/modprobe ds || break |
8 | + /sbin/modprobe $DS || break | ||
12 | + if [ "x$PCIC_EXTRA" != "x" ]; then | 9 | + if [ "x$PCIC_EXTRA" != "x" ]; then |
13 | + /sbin/modprobe $PCIC_EXTRA | 10 | + /sbin/modprobe $PCIC_EXTRA |
14 | + fi | 11 | + fi |
@@ -22,7 +19,7 @@ | |||
22 | else | 19 | else |
23 | echo "module directory $PC not found." | 20 | echo "module directory $PC not found." |
24 | break | 21 | break |
25 | @@ -154,7 +160,7 @@ | 22 | @@ -154,7 +160,7 @@ for x in "1" ; do |
26 | ;; | 23 | ;; |
27 | 24 | ||
28 | status) | 25 | status) |