From: Tony Lindgren <tony@atomide.com>
Date: Tue, 17 May 2011 10:44:50 +0000 (-0700)
Subject: Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next
X-Git-Tag: v3.0-rc1~134^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b08827f4c7a5020855abe0f9b1a316f11275b76b;p=linux.git

Merge branches 'devel-fixes', 'devel-cleanup' and 'devel-genirq' into for-next
---

b08827f4c7a5020855abe0f9b1a316f11275b76b
diff --cc arch/arm/mach-omap2/omap_l3_smx.c
index 4321e7938929,4321e7938929,6a7d87b6bcb4,5f2da7565b68..873c0e33b512
--- a/arch/arm/mach-omap2/omap_l3_smx.c
+++ b/arch/arm/mach-omap2/omap_l3_smx.c
@@@@@ -199,10 -199,10 -193,9 -199,10 +193,9 @@@@@ static irqreturn_t omap3_l3_app_irq(in
    	/* identify the error source */
    	for (err_source = 0; !(status & (1 << err_source)); err_source++)
    									;
   -	error = omap3_l3_readll(base, L3_ERROR_LOG);
  + 
  ++	base = l3->rt + *(omap3_l3_bases[int_type] + err_source);
   +	error = omap3_l3_readll(base, L3_ERROR_LOG);
--  
    	if (error) {
    		error_addr = omap3_l3_readll(base, L3_ERROR_LOG_ADDR);