From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 13 Sep 2012 06:41:03 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20120913~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80013407beb19d3041ef56e4cc165110f0a2bc78;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-ux500/cpu-db8500.c
	drivers/i2c/busses/i2c-omap.c
	drivers/mtd/nand/Kconfig
	drivers/usb/host/Kconfig
---

80013407beb19d3041ef56e4cc165110f0a2bc78
diff --cc arch/arm/kernel/Makefile
index 3319aca0e0a3,d81f3a6d9ad8..5dfef9d97ed9
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -19,11 -19,8 +19,10 @@@ obj-y		:= elf.o entry-armv.o entry-comm
  		   process.o ptrace.o return_address.o sched_clock.o \
  		   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
 -obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
 +obj-$(CONFIG_ATAGS)		+= atags_parse.o
 +obj-$(CONFIG_ATAGS_PROC)	+= atags_proc.o
 +obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
  
- obj-$(CONFIG_LEDS)		+= leds.o
  obj-$(CONFIG_OC_ETM)		+= etm.o
  obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  obj-$(CONFIG_ISA_DMA_API)	+= dma.o
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/i2c/busses/i2c-omap.c
index c78431a4970a,a0e49f6aaf96..0b0254312d21
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@@ -1051,11 -943,12 +1051,12 @@@ omap_i2c_probe(struct platform_device *
  {
  	struct omap_i2c_dev	*dev;
  	struct i2c_adapter	*adap;
 -	struct resource		*mem, *irq, *ioarea;
 +	struct resource		*mem;
- 	struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
+ 	const struct omap_i2c_bus_platform_data *pdata =
+ 		pdev->dev.platform_data;
  	struct device_node	*node = pdev->dev.of_node;
  	const struct of_device_id *match;
 -	irq_handler_t isr;
 +	int irq;
  	int r;
  
  	/* NOTE: driver uses the static register mapping */
diff --cc drivers/usb/host/Kconfig
index 13cd6d558eba,276add2358a1..73152fdede37
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
  	depends on USB && USB_ARCH_HAS_OHCI
  	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
  	select USB_OTG_UTILS if ARCH_OMAP
- 	depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
 -	select USB_ISP1301 if ARCH_LPC32XX
++	depends on USB_ISP1301 || !ARCH_LPC32XX
  	---help---
  	  The Open Host Controller Interface (OHCI) is a standard for accessing
  	  USB 1.1 host controller hardware.  It does more in hardware than Intel's