---

yaml --- r: 262301 b: refs/heads/master c: 12b3e03 h: refs/heads/master i: 262299: 9292886 v: v3
git-mirror · Aug 4, 2011 · 9acc499 · 9acc499
1 parent 3c841ff
commit 9acc499
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd48c085c1cdf9446f92826f1fd451167fb6c2fd
+refs/heads/master: 12b3e038e5bb4860c17d001e92a6fa9964c0a7b9
diff --git a/trunk/drivers/rtc/rtc-omap.c b/trunk/drivers/rtc/rtc-omap.c
@@ -368,7 +368,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
 		pr_info("%s: already running\n", pdev->name);
 
 	/* force to 24 hour mode */
-	new_ctrl = reg & ~(OMAP_RTC_CTRL_SPLIT|OMAP_RTC_CTRL_AUTO_COMP);
+	new_ctrl = reg & (OMAP_RTC_CTRL_SPLIT|OMAP_RTC_CTRL_AUTO_COMP);
 	new_ctrl |= OMAP_RTC_CTRL_STOP;
 
 	/* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE: