diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-06-21 08:17:46 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-21 08:17:46 +0000 |
commit | cf4e0e40139b5127918c03bdaedd8f7570efaece (patch) | |
tree | 76a80f28c9a1c7110eb034d470a742b381eef22d /conf | |
parent | 74703c393c14c2e7d357942fa2739fb703a91465 (diff) | |
parent | cea9a83e6d17067f75e6b8b06390d620dd950eb9 (diff) |
merge of 0e9d72f51e2b65b5d2ccc5321b4872af899180c6
and c5acd74e482d1e7de50bea58a79d8784225f2e5e
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/htcuniversal.conf | 6 | ||||
-rw-r--r-- | conf/machine/include/smartphone-common.conf | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 800cd77540..288f3ebaa9 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d) BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether snd_pcm_oss snd_mixer_oss hidp" +PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor" SERIAL_CONSOLE = "115200 tts/0" @@ -30,14 +30,16 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds" +UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" module_autoload_htcuniversal_power = "htcuniversal_power" module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" +module_autoload_htcuniversal-acx = "htcuniversal_acx" module_autoload_htcuniversal-bt = "htcuniversal_bt" module_autoload_htcuniversal-power = "htcuniversal_power" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf index 2ff8d4bc47..bd5983cdc0 100644 --- a/conf/machine/include/smartphone-common.conf +++ b/conf/machine/include/smartphone-common.conf @@ -3,6 +3,7 @@ ipsec \ nvrd \ mip6-mn \ tun \ +nls-base nls-cp437 nls-iso8859-1 \ fat vfat \ loop \ rfcomm bnep l2cap sco hci_uart hidp \ |