Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

Conflicts:
	conf/distro/vuplus.conf
	recipes/linux/linux-vusolo_3.1.1.bb
	recipes/vuplus/vuplus-dvb-modules.bb

diff --cc recipes/vuplus/vuplus-dvb-modules.bb
index ec06aa6,bab0840..2303662
--- 1/recipes/vuplus/vuplus-dvb-modules.bb
--- 2/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@@ -3,22 -3,24 +3,26 @@@ SECTION = "base
  PRIORITY = "required"
  LICENSE = "proprietary"
  
- KV = "3.1.1"
 -
+ KV = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}"
  
- PV_bm750 = "${KV}"
- PV_vusolo = "${KV}"
- PV_vuuno = "${KV}"
- PV_vuultimo = "${KV}"
+ PV = "${KV}"
  
- SRCDATE_bm750 = "20111123"
- SRCDATE_vusolo = "20111124"
- SRCDATE_vuuno = "20111123"
- SRCDATE_vuultimo = "20111123"
+ SRCDATE_bm750 = "20111125"
+ SRCDATE_vusolo = "20111125"
+ SRCDATE_vuuno = "20111125"
+ SRCDATE_vuultimo = "20111125"
  
+ MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb"
+ MODULES_NAME_vusolo = "procmk\ndvb-bcm7325\nbrcmfb"
+ MODULES_NAME_vuuno = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
+ MODULES_NAME_vuultimo = "procmk\ndvb-bcm7413\nbrcmfb\nfpga_directc"
  
  RDEPENDS_2.6.18 = "initscripts-vuplus kernel (${KV}) kernel-module-firmware-class kernel-module-input kernel-module-evdev kernel-module-i2c-core kernel-module-snd kernel-module-snd-pcm"
  RDEPENDS_3.1 = "initscripts-vuplus kernel (${KV})" 
  
++RDEPENDS = "\
++  ${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '${RDEPENDS_2.6.18}', '${RDEPENDS_3.1}', d)} \
++"
  
  RDEPENDS = "\
    ${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '${RDEPENDS_2.6.18}', '${RDEPENDS_3.1}', d)} \