diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-22 10:04:30 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-22 10:04:30 +0000 |
| commit | c3be2a552db104291accd82b2e674d31d5527fcc (patch) | |
| tree | 422e82bf481b26c2a0e883d60b459cbc243d436e /conf/machine/magician.conf | |
| parent | 3a508238c49e86e0476319bfe71a24fdfdd56b66 (diff) | |
| parent | 4693c8ab28f246ce11a0b80b27ab6127aea14c52 (diff) | |
merge of '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
and 'f0261ce1c4acd6350d91bdaaf2939442d84a222d'
Diffstat (limited to 'conf/machine/magician.conf')
| -rw-r--r-- | conf/machine/magician.conf | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 4e6c9a625a..3d1b602def 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" # # Software/packages selection @@ -34,7 +34,11 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-pxaficp-ir \ kernel-module-uinput \ kernel-module-hci-usb \ - " + kernel-module-magician-flash \ + kernel-module-magician-ds1wm \ + kernel-module-magician-battery \ + kernel-module-magician-phone \ + kernel-module-snd-soc-magician" # # Modules autoload and other boot properties @@ -44,6 +48,11 @@ module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_magician_ds1wm = "magician_ds1wm" +module_autoload_magician-battery = "magician-battery" +module_autoload_magician_phone = "magician_phone" +module_autoload_snd-soc-magician = "snd-soc-magician" +module_autoload_hci_usb = "hci_usb" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" |