summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2008-05-15 09:10:40 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2008-05-15 09:10:40 +0000
commit1bad870be75c7b27966971e237f62b4db660ca02 (patch)
tree03e69caab4bebcac6c80a015b9f06c1827d16fb6
parentf44125b60d426fb5778b5a145e526e2714516646 (diff)
parent2a011801cb8ede0c4fea10c86c978c4ccbaad5ce (diff)
merge of '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
and 'c4f0fa8168863feb54d1292280f576d79b26222f'
-rw-r--r--packages/linux/linux_2.6.23+2.6.24-rc5.bb1
-rw-r--r--packages/linux/linux_2.6.25.bb1
2 files changed, 1 insertions, 1 deletions
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 648fe6b756..d22d5e8f27 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -2,7 +2,6 @@ require linux.inc
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
PR = "r3"
diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb
index aea1347767..ca15db543f 100644
--- a/packages/linux/linux_2.6.25.bb
+++ b/packages/linux/linux_2.6.25.bb
@@ -6,6 +6,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_kilauea = "1"
DEFAULT_PREFERENCE_sequoia = "1"
DEFAULT_PREFERENCE_cm-x270 = "1"
+DEFAULT_PREFERENCE_alix = "1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
file://defconfig"