From 8070472b408c181e6c7508fa87617f438ecf7075 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Wed, 24 Feb 2010 12:05:56 -0700
Subject: [PATCH] --- yaml --- r: 184795 b: refs/heads/master c:
 0cc9314eaf82ecf9914ad2c845574ed5e63c0374 h: refs/heads/master i:   184793:
 4535362029cf72ff30178958056dfaf999e3cc9e   184791:
 58c928d0ae67a9cfe96cdc2ca25aeba12599c793 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-omap2/prcm.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38dbc1ef1150..c4e025d5d7f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a51ba284076437ce36efc8dd9b15983546c043f7
+refs/heads/master: 0cc9314eaf82ecf9914ad2c845574ed5e63c0374
diff --git a/trunk/arch/arm/mach-omap2/prcm.c b/trunk/arch/arm/mach-omap2/prcm.c
index 0f87fdce02a9..356a02010aae 100644
--- a/trunk/arch/arm/mach-omap2/prcm.c
+++ b/trunk/arch/arm/mach-omap2/prcm.c
@@ -127,13 +127,15 @@ u32 omap_prcm_get_reset_sources(void)
 		return prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f;
 	if (cpu_is_omap44xx())
 		return prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f;
+
+	return 0;
 }
 EXPORT_SYMBOL(omap_prcm_get_reset_sources);
 
 /* Resets clock rates and reboots the system. Only called from system.h */
 void omap_prcm_arch_reset(char mode)
 {
-	s16 prcm_offs;
+	s16 prcm_offs = 0;
 
 	if (cpu_is_omap24xx()) {
 		omap2xxx_clk_prepare_for_reboot();