diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-09-06 17:57:09 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-09-06 17:57:09 +0000 |
| commit | d39ad541854182c47c70071aa6c883ba3480b994 (patch) | |
| tree | 068ca2b589703211ec9b130e84aa3ffe8cdb81ea /conf/machine/collie.conf | |
| parent | ee94da8a579022c9654f3e3659b8f2f243c57bb4 (diff) | |
| parent | c5cc423a2ce2c5a1659c171aefcbcec22b768c56 (diff) | |
merge of '4a859de905afc30ec35cf91dcd1dd6c18307c1f8'
and '9c6ceb61576fa98453a24fedb60c9d2b23d79c72'
Diffstat (limited to 'conf/machine/collie.conf')
| -rw-r--r-- | conf/machine/collie.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 429463cc87..c91bdcfc92 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" MACHINE_KERNEL_VERSION ?= "2.6" -require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf +require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -18,7 +18,7 @@ IMAGE_LINGUAS = "" IMAGE_FSTYPES ?= "jffs2 tar.gz" -require conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above |