From 7112ffecb8c0cde09f707ace89a0a7bc7ea31d57 Mon Sep 17 00:00:00 2001
From: Grant Erickson <gerickson@nuovations.com>
Date: Fri, 19 Dec 2008 08:17:54 +0000
Subject: [PATCH] --- yaml --- r: 123121 b: refs/heads/master c:
 e14d77490d3e1da833cff4fee52674c52684ce77 h: refs/heads/master i:   123119:
 8aa2134c37c6d12d805aab06839df2425a34ae64 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/include/asm/dcr.h | 4 ++--
 trunk/arch/powerpc/sysdev/dcr.c      | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9e3e2032db70..23593c17b3d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dce3ce5c55c848f00429005a46fd6246cfabfbe
+refs/heads/master: e14d77490d3e1da833cff4fee52674c52684ce77
diff --git a/trunk/arch/powerpc/include/asm/dcr.h b/trunk/arch/powerpc/include/asm/dcr.h
index d13fb68bb5c0..9d6851cfb841 100644
--- a/trunk/arch/powerpc/include/asm/dcr.h
+++ b/trunk/arch/powerpc/include/asm/dcr.h
@@ -68,9 +68,9 @@ typedef dcr_host_mmio_t dcr_host_t;
  * additional helpers to read the DCR * base from the device-tree
  */
 struct device_node;
-extern unsigned int dcr_resource_start(struct device_node *np,
+extern unsigned int dcr_resource_start(const struct device_node *np,
 				       unsigned int index);
-extern unsigned int dcr_resource_len(struct device_node *np,
+extern unsigned int dcr_resource_len(const struct device_node *np,
 				     unsigned int index);
 #endif /* CONFIG_PPC_DCR */
 #endif /* __ASSEMBLY__ */
diff --git a/trunk/arch/powerpc/sysdev/dcr.c b/trunk/arch/powerpc/sysdev/dcr.c
index a8ba9983dd5a..bb44aa9fd470 100644
--- a/trunk/arch/powerpc/sysdev/dcr.c
+++ b/trunk/arch/powerpc/sysdev/dcr.c
@@ -124,7 +124,8 @@ EXPORT_SYMBOL_GPL(dcr_write_generic);
 
 #endif /* defined(CONFIG_PPC_DCR_NATIVE) && defined(CONFIG_PPC_DCR_MMIO) */
 
-unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
+unsigned int dcr_resource_start(const struct device_node *np,
+				unsigned int index)
 {
 	unsigned int ds;
 	const u32 *dr = of_get_property(np, "dcr-reg", &ds);
@@ -136,7 +137,7 @@ unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
 }
 EXPORT_SYMBOL_GPL(dcr_resource_start);
 
-unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
+unsigned int dcr_resource_len(const struct device_node *np, unsigned int index)
 {
 	unsigned int ds;
 	const u32 *dr = of_get_property(np, "dcr-reg", &ds);