aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes/linux/linux-palmpre/defconfig10
-rw-r--r--recipes/linux/linux-palmpre_git.bb2
2 files changed, 7 insertions, 5 deletions
diff --git a/recipes/linux/linux-palmpre/defconfig b/recipes/linux/linux-palmpre/defconfig
index 7cf2f6b1a9..4611f7adef 100644
--- a/recipes/linux/linux-palmpre/defconfig
+++ b/recipes/linux/linux-palmpre/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-palm
-# Thu Sep 30 06:47:30 2010
+# Thu Dec 2 01:21:44 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -31,7 +31,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-joplin-3430"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -683,7 +682,7 @@ CONFIG_IEEE80211=m
#
# Generic Driver Options
#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
CONFIG_DEVTMPFS=y
# CONFIG_DEVTMPFS_MOUNT is not set
CONFIG_STANDALONE=y
@@ -1519,7 +1518,9 @@ CONFIG_LEDS_LP8501_DBG=y
#
# LED Triggers
#
-# CONFIG_LEDS_TRIGGERS is not set
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
@@ -1867,3 +1868,4 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
+CONFIG_LOCALVERSION="-joplin-3430"
diff --git a/recipes/linux/linux-palmpre_git.bb b/recipes/linux/linux-palmpre_git.bb
index e8cae3ac05..4183cb96de 100644
--- a/recipes/linux/linux-palmpre_git.bb
+++ b/recipes/linux/linux-palmpre_git.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git/"
SRCREV = "33239e4074f4716a674b450a443b64add201bf39"
KV = "2.6.24"
-PR="r3"
+PR="r4"
PV = "${KV}+gitr${SRCPV}"
# linux.inc overrides LOCAVERSION but we like to stay with the one used originally