From 39e8d162102d116ead1c85bacc1dc5710689e2cd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 18 Nov 2005 23:15:27 +0000 Subject: ipaq-pxa270.conf: update hx4700 machine conf for 2.6.13-hh1 - add gadgetfs and nls_iso8859-1 modules - rename snd_pxa_i2sound_hx4700 to snd_hx4700-audio - fix snd-mixer-oss module autoload --- conf/machine/ipaq-pxa270.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index b9925852e5..626b5cf218 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -17,9 +17,9 @@ ROOT_FLASH_SIZE = "80" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \ +PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ - nls_cp437 nls_utf8" + nls_cp437 nls_iso8859-1 nls_utf8" SERIAL_CONSOLE = "115200 ttyS0" @@ -27,15 +27,15 @@ include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" +GPE_EXTRA_DEPENDS += "gaim" +GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" + hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" @@ -45,9 +45,9 @@ module_autoload_mmc_block = "mmc_block" module_autoload_hx4700_ts = "hx4700_ts" module_autoload_hx4700_navpt = "hx4700_navpt" module_autoload_hx4700_bt = "hx4700_bt" -module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700" +module_autoload_snd-hx4700_audio = "snd-hx4700_audio" module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-pcm-oss = "snd-mixer-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. -- cgit v1.2.3