From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 22:35:48 +0000 (-0700)
Subject: Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesa... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1875962377574b4edb7b164001e3e341c25290d5;p=deliverable%2Flinux.git

Merge branch 'soc-core' of git://git./linux/kernel/git/horms/renesas into next/dt

* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs'
  + sync to 3.6-rc3
---

1875962377574b4edb7b164001e3e341c25290d5
diff --cc drivers/gpio/gpio-pxa.c
index db5c2958f973,9cac88a65f78..9528779ca463
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@@ -464,12 -530,12 +489,12 @@@ static int pxa_irq_domain_map(struct ir
  
  const struct irq_domain_ops pxa_irq_domain_ops = {
  	.map	= pxa_irq_domain_map,
+ 	.xlate	= irq_domain_xlate_twocell,
  };
  
- #ifdef CONFIG_OF
  static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)
  {
 -	int ret, nr_banks, nr_gpios, irq_base;
 +	int ret, nr_banks, nr_gpios;
  	struct device_node *prev, *next, *np = pdev->dev.of_node;
  	const struct of_device_id *of_id =
  				of_match_device(pxa_gpio_dt_ids, &pdev->dev);