diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2009-08-15 15:01:02 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-08-15 15:01:02 +0100 |
| commit | b9aba715404627590e9d406eda19d3fb6eb30aa4 (patch) | |
| tree | 05609574a4d2bf98b51900f1b53e37ff0283983c /conf/machine/include/zaurus-2.6.inc | |
| parent | 321f298f4b9477ce563eeef68d82a28366788a52 (diff) | |
| parent | 55afc69df3bedfc5d5c7d73a7debc8307edf40a6 (diff) | |
| download | openembedded-b9aba715404627590e9d406eda19d3fb6eb30aa4.tar.gz | |
Merge branch 'org.openembedded.dev' of /home/dp/openembedded/org.openembedded.dev into xora/angstrom-srcpv
Conflicts:
recipes/linux/linux-omap_git.bb
recipes/u-boot/u-boot_git.bb
Diffstat (limited to 'conf/machine/include/zaurus-2.6.inc')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index ba923f9515..cd83a7b5a6 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -31,22 +31,20 @@ MACHINE_FEATURES_append_spitz = " usbhost " MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" -MACHINE_EXTRA_RDEPENDS_collie = "" +MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" -# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel +# Fixme ? module-snd for collie +MACHINE_EXTRA_RRECOMMENDS_collie = "" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" - # For tosa: OHCI suspend/resume fixup # wlan-ng is now in kernel (2.6.29) # Fixme ? module-snd for tosa MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" -# Fixme ? module-snd for collie -MACHINE_EXTRA_RRECOMMENDS_collie = "" - require conf/machine/include/zaurus-kernel.inc require conf/machine/include/initramfs-kexecboot.inc |