[oe-commits] Koen Kooi : linux-omap 2.6.37: update defconfig to make ds1307 builtin

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 72a8f3dcacfd222e60b0168a67236394bd051598
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=72a8f3dcacfd222e60b0168a67236394bd051598

Author: Koen Kooi <koen at openembedded.org>
Date:   Sat May  7 20:55:41 2011 +0200

linux-omap 2.6.37: update defconfig to make ds1307 builtin

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 .../linux/linux-omap-2.6.37/beagleboard/defconfig  |   10 +++++++---
 recipes/linux/linux-omap_2.6.37.bb                 |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/recipes/linux/linux-omap-2.6.37/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.37/beagleboard/defconfig
index 738d894..08a7630 100644
--- a/recipes/linux/linux-omap-2.6.37/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.37/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.37 Kernel Configuration
-# Thu Jan 27 16:18:14 2011
+# Sat May  7 20:36:14 2011
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -481,6 +481,7 @@ CONFIG_CAN_PM_TRACE=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_PM_RUNTIME=y
@@ -2722,7 +2723,10 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -2736,7 +2740,7 @@ CONFIG_RTC_INTF_DEV=y
 #
 # I2C RTC drivers
 #
-CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
diff --git a/recipes/linux/linux-omap_2.6.37.bb b/recipes/linux/linux-omap_2.6.37.bb
index 8cdc353..9c7ce01 100644
--- a/recipes/linux/linux-omap_2.6.37.bb
+++ b/recipes/linux/linux-omap_2.6.37.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard|overo|omap3evm|omap3-touchbook|usrp-e1xx)"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
 PV = "2.6.37"
-MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "e+gitr${SRCREV}"
 SRCREV = "fa3b4e23ec20cfc944db7cc2b30b0d82c20e4472"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.37:"