summaryrefslogtreecommitdiff
path: root/conf/machine/include/collie-2.6.inc
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-01-31 21:24:36 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-01-31 21:24:36 +0000
commitb20edcd38445574cbdd667d5e82fb59572e4cab2 (patch)
tree5a52d1265144694e035f2087d0495c83b69f5c9a /conf/machine/include/collie-2.6.inc
parent64529f883fb70f97a28cb8fe082fb7b357d509d9 (diff)
parentd8918d114e1286ff97435a543b65d270e79a0f92 (diff)
merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'
and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'
Diffstat (limited to 'conf/machine/include/collie-2.6.inc')
-rw-r--r--conf/machine/include/collie-2.6.inc6
1 files changed, 0 insertions, 6 deletions
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
deleted file mode 100644
index f22ffce6c2..0000000000
--- a/conf/machine/include/collie-2.6.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
-
-MACHINE_EXTRA_RDEPENDS = "kernel-modules"