[PATCH] Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

[Mathieu Desnoyers]

Missing ifndef __ASSEMBLY__ in include/asm-powerpc/dcr.h

A missing structure forward declaration causes a lot of warnings when
compiling for a powerpc 405. Because this header is used for assembly
too, the declaration must be put within #ifndef __ASSEMBLY__, as should
be the function prototypes.

This patch applies on 2.6.20.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>

--- a/include/asm-powerpc/dcr.h
+++ b/include/asm-powerpc/dcr.h
@@ -33,10 +33,13 @@
  * base from the device-tree
  */
 #ifdef CONFIG_PPC_MERGE
+#ifndef __ASSEMBLY__
+struct device_node;
 extern unsigned int dcr_resource_start(struct device_node *np,
 				       unsigned int index);
 extern unsigned int dcr_resource_len(struct device_node *np,
 				     unsigned int index);
+#endif
 #endif /* CONFIG_PPC_MERGE */
 
 #endif /* CONFIG_PPC_DCR */
-- 
Mathieu Desnoyers
Computer Engineering Graduate Student, École Polytechnique de Montréal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68