summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-31 09:36:17 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-31 09:36:17 +0000
commit325e78d34ac2fc315e0565d81958296869821788 (patch)
treeb88aea6043cdd10f78abf376c404e03097141369
parent6b0294164e8127a4f668270547e839d33e7b73e6 (diff)
parent3df41b16010b2fae4036658d023de0c2e45e8423 (diff)
merge of '5bb8dd4df9a12509e1f1ff695bf5e3417da6ace6'
and 'eba154367679f74d07e194d2995c74b2810109a2'
-rwxr-xr-xpackages/linux/linux-ezx-2.6.23/a780/defconfig4
-rw-r--r--packages/linux/linux-ezx_2.6.23.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-ezx-2.6.23/a780/defconfig b/packages/linux/linux-ezx-2.6.23/a780/defconfig
index f1738cd2c8..c59efc8906 100755
--- a/packages/linux/linux-ezx-2.6.23/a780/defconfig
+++ b/packages/linux/linux-ezx-2.6.23/a780/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23.1
-# Mon Oct 29 19:21:10 2007
+# Wed Oct 31 09:05:11 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -206,7 +206,7 @@ CONFIG_XSCALE_PMU=y
# Kernel Features
#
CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set
CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT=y
CONFIG_HZ=100
diff --git a/packages/linux/linux-ezx_2.6.23.bb b/packages/linux/linux-ezx_2.6.23.bb
index 957fda0e8c..d97855a451 100644
--- a/packages/linux/linux-ezx_2.6.23.bb
+++ b/packages/linux/linux-ezx_2.6.23.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r1"
+PR = "${EZX}-r2"
# unstable branch, use 2.6.21 if you want something working
DEFAULT_PREFERENCE = "-99"