From 598e218866edbc51fda4f35b307a9d3e58c92905 Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabio.baltieri@linaro.org>
Date: Fri, 18 Jan 2013 12:40:11 +0100
Subject: [PATCH] --- yaml --- r: 357592 b: refs/heads/master c:
 98c60a0d3afc8f68e6e4b85b93df14e238fec3cb h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/include/linux/mfd/dbx500-prcmu.h | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e46c10e68e08..8d0c12e0d7c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01560f6bb958b821ceec98590a7147d610a62625
+refs/heads/master: 98c60a0d3afc8f68e6e4b85b93df14e238fec3cb
diff --git a/trunk/include/linux/mfd/dbx500-prcmu.h b/trunk/include/linux/mfd/dbx500-prcmu.h
index c202d6c4d879..c6e0608a21b5 100644
--- a/trunk/include/linux/mfd/dbx500-prcmu.h
+++ b/trunk/include/linux/mfd/dbx500-prcmu.h
@@ -146,6 +146,18 @@ enum prcmu_clock {
 	PRCMU_DSI2ESCCLK,
 };
 
+/**
+ * enum prcmu_wdog_id - PRCMU watchdog IDs
+ * @PRCMU_WDOG_ALL: use all timers
+ * @PRCMU_WDOG_CPU1: use first CPU timer only
+ * @PRCMU_WDOG_CPU2: use second CPU timer conly
+ */
+enum prcmu_wdog_id {
+	PRCMU_WDOG_ALL = 0x00,
+	PRCMU_WDOG_CPU1 = 0x01,
+	PRCMU_WDOG_CPU2 = 0x02,
+};
+
 /**
  * enum ape_opp - APE OPP states definition
  * @APE_OPP_INIT: