diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-06-17 10:25:34 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-06-17 10:25:34 +0000 |
| commit | aff97e9475c2a48122851f24b5500fd11c4600c4 (patch) | |
| tree | 8f08e0d2536697e0a9d65cd3aabe3887e2269ea2 /conf | |
| parent | cfd086c000f94b852dc953d2ed2637e155a2e899 (diff) | |
| parent | ce8819cf9c39e47d0ae5718e6ed960f773f75c31 (diff) | |
merge of 'b0f2b6b66673367e2119e54761590a724c20c2e1'
and 'd4199b222eb8c2755fae3eefe9fdbd225e6d9e81'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/machine/magician.conf | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 27e0c78769..46a293235d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -132,7 +132,7 @@ PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh7" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh8" PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 719c9a5b03..aa30d3164e 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -34,15 +34,21 @@ XSERVER = "xserver-kdrive-fbdev" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ + kernel-module-af-key \ + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-leds-magician \ kernel-module-magician-ts \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" + # # Modules autoload and other boot properties # @@ -54,6 +60,7 @@ 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_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" |