diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-18 12:45:56 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-18 12:45:56 +0000 |
| commit | ae09e2d5082b42d6ea608b07f2e207789a00cd9f (patch) | |
| tree | b31ae7f0f1fb06ce248a29823583408f3ed6b3c4 /conf/machine/include | |
| parent | 781a49f886ad413031e273be8458ec4b77ad2322 (diff) | |
| parent | 4b276fbe128b0eeb6e4fb43c5d2896287487265c (diff) | |
merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'
and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/collie-2.6.conf | 4 | ||||
| -rw-r--r-- | conf/machine/include/lsppc.conf | 1 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.conf | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf index eab879368c..f22ffce6c2 100644 --- a/conf/machine/include/collie-2.6.conf +++ b/conf/machine/include/collie-2.6.conf @@ -1,4 +1,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp" SERIAL_CONSOLE = "115200 ttySA0" -MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen" +MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi" + +MACHINE_EXTRA_RDEPENDS = "kernel-modules" diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf index 161f3ad8c1..064db79b29 100644 --- a/conf/machine/include/lsppc.conf +++ b/conf/machine/include/lsppc.conf @@ -7,7 +7,6 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" TARGET_FPU = "hard" -MACHINE_TASK_PROVIDER = "task-base" USE_DEVFS = "0" diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 1f3313c9b5..98f8cbdded 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -38,6 +38,5 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" -MACHINE_TASK_PROVIDER = "task-base" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" |