From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 06:14:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20120824~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40eae70814e2bfc54cfc6737b3ef8c1267c86bfe;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	drivers/mtd/nand/Kconfig
---

40eae70814e2bfc54cfc6737b3ef8c1267c86bfe
diff --cc arch/arm/mach-realview/realview_eb.c
index d7a6e9cebba4,21661ade885f..36f5d296131e
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@@ -30,8 -30,8 +30,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>
diff --cc arch/arm/mach-realview/realview_pb1176.c
index 361f898884c8,c0ff882c5cb8..049c3738777b
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@@ -32,8 -32,8 +32,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>
diff --cc arch/arm/mach-realview/realview_pb11mp.c
index c56bc8d4d11b,30779ae40c04..9966672d86cd
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@@ -30,8 -30,8 +30,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>
diff --cc arch/arm/mach-realview/realview_pba8.c
index 040937582453,081cd72c090e..25fdc6b0135c
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@@ -29,8 -29,8 +29,7 @@@
  #include <linux/io.h>
  
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  
diff --cc arch/arm/mach-realview/realview_pbx.c
index 97885dc11e8c,1ce62b9f846c..05f28d853c70
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@@ -28,8 -28,8 +28,7 @@@
  #include <linux/io.h>
  
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/smp_twd.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
diff --cc arch/powerpc/sysdev/fsl_msi.c
index 7e2b2f2e3ecd,51ffafae561e..63c5f04ea580
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@@ -509,14 -506,12 +509,14 @@@ static const struct of_device_id fsl_of
  	},
  	{
  		.compatible = "fsl,ipic-msi",
- 		.data = (void *)&ipic_msi_feature,
+ 		.data = &ipic_msi_feature,
  	},
 +#ifdef CONFIG_EPAPR_PARAVIRT
  	{
  		.compatible = "fsl,vmpic-msi",
- 		.data = (void *)&vmpic_msi_feature,
+ 		.data = &vmpic_msi_feature,
  	},
 +#endif
  	{}
  };
  
diff --cc drivers/gpio/gpio-pxa.c
index 9cac88a65f78,db5c2958f973..9528779ca463
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@@ -530,12 -464,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);