From: Paul Mackerras <paulus@samba.org>
Date: Thu, 31 Aug 2006 05:45:48 +0000 (+1000)
Subject: Merge branch 'merge'
X-Git-Tag: v2.6.19-rc1~1300^2~43
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=aa43f77939c97bf9d3580c6a5e71a5a40290e451;p=linux.git

Merge branch 'merge'
---

aa43f77939c97bf9d3580c6a5e71a5a40290e451
diff --cc arch/powerpc/kernel/prom_parse.c
index 603203276ef6,a10825a5dfe6..603dff3ad62a
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@@ -642,11 -639,11 +642,11 @@@ void of_irq_map_init(unsigned int flags
  
  }
  
- int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
 -int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
 -		   u32 *addr, struct of_irq *out_irq)
++int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
 +		const u32 *addr, struct of_irq *out_irq)
  {
  	struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;
 -	u32 *tmp, *imap, *imask;
 +	const u32 *tmp, *imap, *imask;
  	u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
  	int imaplen, match, i;
  
diff --cc include/asm-powerpc/prom.h
index 7a457bd462a2,d0fa1b9aed35..c15e66a2e681
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@@ -288,11 -289,12 +289,12 @@@ extern void of_irq_map_init(unsigned in
   *
   */
  
 -extern int of_irq_map_raw(struct device_node *parent, u32 *intspec,
 -			  u32 ointsize, u32 *addr,
 +extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
- 			  const u32 *addr, struct of_irq *out_irq);
++			  u32 ointsize, const u32 *addr,
+ 			  struct of_irq *out_irq);
  
  
 -/***
 +/**
   * of_irq_map_one - Resolve an interrupt for a device
   * @device:	the device whose interrupt is to be resolved
   * @index:     	index of the interrupt to resolve