From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 11 Oct 2006 15:44:40 +0000 (+0000)
Subject: merge of '154202574ebfd29256ed7276e3e9e0a12972ab15'
X-Git-Tag: Release-2010-05/1~9453^2~587
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0249326d4b2997b4791d3dae4274826aac7eb613;p=openembedded.git

Merge ... '154202574ebfd29256ed7276e3e9e0a12972ab15'
     and '9620e56cde605bf1b74be65fd400fb3044fb98e8'
---

0249326d4b2997b4791d3dae4274826aac7eb613
diff --cc conf/machine/h2200.conf
index 46a612ec5d,b44584b179..994b2dd396
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@@ -16,8 -16,11 +16,8 @@@ PCMCIA_MANAGER = "pcmciautils
  
  MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
  
 -MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel udev"
 -MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-snd_pcm_oss \
 -				g_ether \
 -				g_serial \
 -				g_file_storage" 
 +MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel"
- MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd_pcm_oss"
++
  
  #autoload on boot:
  module_autoload_snd-pcm-oss 	= "snd-pcm-oss"