From ea7da1dd061b7ef4eabd61c6073e6a27709fe972 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 11 Oct 2005 17:20:26 +0000
Subject: More merging with OE. Fix settings-daemon depends.

git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch')

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)
-- 
cgit v1.2.3