diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-06-09 08:03:22 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-06-09 08:03:22 +0000 |
| commit | 4270182b51b311e57eaa5bb2e6b05fa8045e1fc2 (patch) | |
| tree | 9f2b8d04edf9b4d667619051563a1c9a642e6311 | |
| parent | d3141efc14b281e9c12de4b197c8116367ce2477 (diff) | |
| parent | f22ed4c6e00a658cb5b74d236a2b155f07664749 (diff) | |
| download | openembedded-4270182b51b311e57eaa5bb2e6b05fa8045e1fc2.tar.gz | |
merge of '4cd0be119f68bfd70fb48fb43e13b4b4e7b7524f'
and 'e33c0ba6ba7a08e85937199e5f0c2a708350dba7'
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 2 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-boot.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 3f84138ac8..ae36f789c9 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -35,7 +35,7 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd" 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" -MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" +MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_collie = "smallscreen" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 15835508aa..3fd87de1b5 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r63" +PR = "r64" inherit task diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 5663ff5a3d..cb4db34e64 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r43" +PR = "r44" inherit task |