More packages merging with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@390 311d38ba-8fff-0310-9ca6-ca027cbcb966

openembedded/conf/machine/ipaq-pxa270.conf

@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 #use this for a hx2xxx ipaq
 #PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
-
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 ROOT_FLASH_SIZE = "80"
@@ -21,6 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -e 256KiB -p"
 
 MODUTILS = "26"	
+PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
@@ -34,7 +33,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
@@ -47,7 +45,7 @@ HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pc
                   hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
 
-
+module_autoload_evdev = "evdev"
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
 module_autoload_hx4700_pcmcia = "hx4700_pcmcia"