diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:24:40 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:24:40 +0000 |
commit | 7cbe26dd9647243ade652ef1a7a6fbb2402c6576 (patch) | |
tree | 162b32aa7ee07da4b9169ac44325ee475a042065 /conf/machine/mx31ads.conf | |
parent | 4b7e6a49215b00d0cfa9a0fde3808f032a9599e5 (diff) | |
parent | 6a4f79a712999ac6764b7424adbeb86272a1eda4 (diff) |
merge of '4876e130f4dda342390929a72c2c452dfa33d3ac'
and 'e0d9912acaac13bd724188fe1ad13ef35363ee75'
Diffstat (limited to 'conf/machine/mx31ads.conf')
-rw-r--r-- | conf/machine/mx31ads.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index 33456a4b03..07976f7dbd 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-arm1136jf-s.conf +require conf/machine/include/tune-arm1136jf-s.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" |