From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 05:55:24 +0000 (+1000)
Subject: Merge remote-tracking branch 'irqdomain/irqdomain/next'
X-Git-Tag: next-20130619~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bc44f903bd109636bdcfd1b9b3c3b761a866b691;p=karo-tx-linux.git

Merge remote-tracking branch 'irqdomain/irqdomain/next'

Conflicts:
	kernel/irq/irqdomain.c
---

bc44f903bd109636bdcfd1b9b3c3b761a866b691
diff --cc kernel/irq/irqdomain.c
index a341b3d433ad,13f265430c25..e0c3366300a1
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@@ -665,8 -475,20 +475,8 @@@ unsigned int irq_create_of_mapping(stru
  
  	domain = controller ? irq_find_host(controller) : irq_default_domain;
  	if (!domain) {
- 		pr_warning("no irq domain found for %s !\n",
- 			   of_node_full_name(controller));
 -#ifdef CONFIG_MIPS
 -		/*
 -		 * Workaround to avoid breaking interrupt controller drivers
 -		 * that don't yet register an irq_domain.  This is temporary
 -		 * code. ~~~gcl, Feb 24, 2012
 -		 *
 -		 * Scheduled for removal in Linux v3.6.  That should be enough
 -		 * time.
 -		 */
 -		if (intsize > 0)
 -			return intspec[0];
 -#endif
+ 		pr_warn("no irq domain found for %s !\n",
+ 			of_node_full_name(controller));
  		return 0;
  	}