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/collie-2.6.conf | |
| parent | 781a49f886ad413031e273be8458ec4b77ad2322 (diff) | |
| parent | 4b276fbe128b0eeb6e4fb43c5d2896287487265c (diff) | |
merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'
and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'
Diffstat (limited to 'conf/machine/include/collie-2.6.conf')
| -rw-r--r-- | conf/machine/include/collie-2.6.conf | 4 |
1 files changed, 3 insertions, 1 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" |