From: nslu2-linux.adm@bkbits.net Date: Mon, 28 Feb 2005 20:35:41 +0000 (+0000) Subject: Merge bk://oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~14830 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09c6ad7b9395bddb99ea6d27ea632753ceecd11c;p=openembedded.git Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/28 08:19:02+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/02/28 08:18:44+00:00 rpsys.net!RP machine/c7x0.conf: Correct the include order BKrev: 4223809dUhUAhpUprZC8CQ-UVM5S4w --- diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 5caa6defae..5426795dea 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,12 +2,11 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -include conf/machine/zaurus-clamshell.conf - KERNEL_VERSION ?= "2.4" include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf ROOT_FLASH_SIZE = "32" - # yes, the husky has 64MB, I know... Be happy, that way you can install more software :) + +include conf/machine/zaurus-clamshell.conf