From 8b3dff229bfaf8868431cc2e736c42e133f9f809 Mon Sep 17 00:00:00 2001
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Date: Thu, 22 Nov 2012 12:16:43 +0100
Subject: [PATCH] --- yaml --- r: 336566 b: refs/heads/master c:
 b8fbdc42c5c5df8ab1f358fe90e3a8a1bdc9ae48 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/of/base.c  | 4 ++--
 trunk/include/linux/of.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1316b5238e93..f40687bad7a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a92a385f867b26297b736e9b9cc42bd6dbf0f2b
+refs/heads/master: b8fbdc42c5c5df8ab1f358fe90e3a8a1bdc9ae48
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 0ceb26a16050..c3724110a288 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -978,8 +978,8 @@ EXPORT_SYMBOL_GPL(of_property_count_strings);
  * Returns the device_node pointer with refcount incremented.  Use
  * of_node_put() on it when done.
  */
-struct device_node *
-of_parse_phandle(struct device_node *np, const char *phandle_name, int index)
+struct device_node *of_parse_phandle(const struct device_node *np,
+				     const char *phandle_name, int index)
 {
 	const __be32 *phandle;
 	int size;
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index 13e0aacb4d9f..7337dc109c89 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -270,7 +270,7 @@ extern int of_n_size_cells(struct device_node *np);
 extern const struct of_device_id *of_match_node(
 	const struct of_device_id *matches, const struct device_node *node);
 extern int of_modalias_node(struct device_node *node, char *modalias, int len);
-extern struct device_node *of_parse_phandle(struct device_node *np,
+extern struct device_node *of_parse_phandle(const struct device_node *np,
 					    const char *phandle_name,
 					    int index);
 extern int of_parse_phandle_with_args(struct device_node *np,
@@ -438,7 +438,7 @@ static inline int of_property_match_string(struct device_node *np,
 	return -ENOSYS;
 }
 
-static inline struct device_node *of_parse_phandle(struct device_node *np,
+static inline struct device_node *of_parse_phandle(const struct device_node *np,
 						   const char *phandle_name,
 						   int index)
 {