From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 4 Jul 2005 17:25:45 +0000 (+0000)
Subject: merge of 3337830555cb6398337a599f4649e61cac2ae122
X-Git-Tag: Release-2010-05/1~9453^2~4237
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c2c9a48b6502d670f0301041ebf6688fe2253a5;p=openembedded.git

merge of 3337830555cb6398337a599f4649e61cac2ae122
     and a96120ae4432f090395e5fa91129bb55062af8ee
---

1c2c9a48b6502d670f0301041ebf6688fe2253a5
diff --cc conf/machine/nokia770.conf
index 31da23e4fc,77296e3b8e..7708954845
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@@ -32,11 -32,11 +32,11 @@@ SERIAL_CONSOLE = "115200 ttyS0
  #build omap1 till nokia releases the patches
  PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
  
 -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils  \
 +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils  nokia770-init \
  pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
  
 -BOOTSTRAP_EXTRA_RDEPENDS = "kernel        udev sysfsutils  \
 +BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils  nokia770-init \
- pcmcia-cs apm  ppp wireless-tools udev-utils console-tools"
+ pcmcia-cs apm  ppp wireless-tools irda-utils udev-utils console-tools"
  
  # NFS Modules
  #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"