From 4cd45db48ba0a53e0bdc3da5ff9bb268b5b7b09e Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 21 Jul 2010 10:13:06 +0000
Subject: [PATCH] --- yaml --- r: 208717 b: refs/heads/master c:
 b5272b509a8570bb559156001e74ee162c5cb96a h: refs/heads/master i:   208715:
 7f2e15830ead7703215698db8780ab5f34ede18b v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/sh_clk.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5491dc97b4a7..e6f9f156c796 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71c3ba9a94c88c43e7216869531c8fbbacd15d9b
+refs/heads/master: b5272b509a8570bb559156001e74ee162c5cb96a
diff --git a/trunk/include/linux/sh_clk.h b/trunk/include/linux/sh_clk.h
index 1636d1e2a5f1..08a07b9a894f 100644
--- a/trunk/include/linux/sh_clk.h
+++ b/trunk/include/linux/sh_clk.h
@@ -25,6 +25,10 @@ struct clk {
 	int			id;
 
 	struct clk		*parent;
+	struct clk		**parent_table;	/* list of parents to */
+	unsigned short		parent_num;	/* choose between */
+	unsigned char		src_shift;	/* source clock field in the */
+	unsigned char		src_width;	/* configuration register */
 	struct clk_ops		*ops;
 
 	struct list_head	children;