From: Olof Johansson <olof@lixom.net>
Date: Mon, 26 Nov 2012 09:26:14 +0000 (-0800)
Subject: Merge branch 'orion/cleanup' into orion/dt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=52cfa7e54b480661e20dfd8788a24cfcba8a0ca5;p=linux-beck.git

Merge branch 'orion/cleanup' into orion/dt

Merge in the cleanups that should have been used as the base of the DT
branch instead of letting the conflicts be exposed all the way up to
the toplevel merges.

All of these are caused by cleanups being done both in the cleanup branch
and the dt branch, resulting in remove/remove conflicts of header files.

By Andrew Lunn (3) and others
via Jason Cooper
* orion/cleanup:
  ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
  ARM: Kirkwood: checkpatch cleanups
  ARM: Kirkwood: Fix sparse warnings.
  ARM: Kirkwood: Remove unused includes
  ARM: kirkwood: cleanup lsxl board includes

Remove/remove conflicts in:
	arch/arm/mach-kirkwood/board-dockstar.c
	arch/arm/mach-kirkwood/board-goflexnet.c
	arch/arm/mach-kirkwood/board-lsxl.c

Signed-off-by: Olof Johansson <olof@lixom.net>
---

52cfa7e54b480661e20dfd8788a24cfcba8a0ca5
diff --cc arch/arm/mach-kirkwood/board-dockstar.c
index 726cfc4b8921,6912882b0aa9..d7196db33984
--- a/arch/arm/mach-kirkwood/board-dockstar.c
+++ b/arch/arm/mach-kirkwood/board-dockstar.c
@@@ -16,21 -16,10 +16,8 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/ata_platform.h>
  #include <linux/mv643xx_eth.h>
- #include <linux/of.h>
- #include <linux/of_address.h>
- #include <linux/of_fdt.h>
- #include <linux/of_irq.h>
- #include <linux/of_platform.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <mach/kirkwood.h>
- #include <mach/bridge-regs.h>
- #include <linux/platform_data/mmc-mvsdio.h>
 -#include <linux/gpio.h>
  #include "common.h"
 -#include "mpp.h"
  
  static struct mv643xx_eth_platform_data dockstar_ge00_data = {
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
diff --cc arch/arm/mach-kirkwood/board-dreamplug.c
index 3e2d95d629ee,8a8ebe09e512..08248e24ffcd
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@@ -13,25 -13,11 +13,10 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/ata_platform.h>
  #include <linux/mv643xx_eth.h>
- #include <linux/of.h>
- #include <linux/of_address.h>
- #include <linux/of_fdt.h>
- #include <linux/of_irq.h>
- #include <linux/of_platform.h>
  #include <linux/gpio.h>
- #include <linux/mtd/physmap.h>
- #include <linux/spi/flash.h>
- #include <linux/spi/spi.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <mach/kirkwood.h>
- #include <mach/bridge-regs.h>
  #include <linux/platform_data/mmc-mvsdio.h>
  #include "common.h"
 -#include "mpp.h"
  
  static struct mv643xx_eth_platform_data dreamplug_ge00_data = {
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
diff --cc arch/arm/mach-kirkwood/board-goflexnet.c
index 3b9661802f8c,5dcd0d62aa42..9db979aec82e
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@@ -18,21 -18,10 +18,8 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/ata_platform.h>
  #include <linux/mv643xx_eth.h>
- #include <linux/of.h>
- #include <linux/of_address.h>
- #include <linux/of_fdt.h>
- #include <linux/of_irq.h>
- #include <linux/of_platform.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <mach/kirkwood.h>
- #include <mach/bridge-regs.h>
- #include <linux/platform_data/mmc-mvsdio.h>
 -#include <linux/gpio.h>
  #include "common.h"
 -#include "mpp.h"
  
  static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
diff --cc arch/arm/mach-kirkwood/board-ib62x0.c
index b6e5db9c7ed0,6d3a56421142..9f6f496380d8
--- a/arch/arm/mach-kirkwood/board-ib62x0.c
+++ b/arch/arm/mach-kirkwood/board-ib62x0.c
@@@ -13,15 -13,13 +13,9 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/platform_device.h>
- #include <linux/mtd/partitions.h>
- #include <linux/ata_platform.h>
  #include <linux/mv643xx_eth.h>
 -#include <linux/gpio.h>
  #include <linux/input.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <mach/kirkwood.h>
  #include "common.h"
 -#include "mpp.h"
 -
 -#define IB62X0_GPIO_POWER_OFF	24
  
  static struct mv643xx_eth_platform_data ib62x0_ge00_data = {
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
diff --cc arch/arm/mach-kirkwood/board-iconnect.c
index 7d3c54c8490b,24f5aa7f698b..c8ebde4919e2
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@@ -10,17 -10,10 +10,9 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/platform_device.h>
  #include <linux/of.h>
- #include <linux/of_address.h>
- #include <linux/of_fdt.h>
- #include <linux/of_irq.h>
- #include <linux/of_platform.h>
  #include <linux/mv643xx_eth.h>
- #include <linux/gpio.h>
- #include <asm/mach/arch.h>
- #include <mach/kirkwood.h>
  #include "common.h"
 -#include "mpp.h"
  
  static struct mv643xx_eth_platform_data iconnect_ge00_data = {
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(11),
diff --cc arch/arm/mach-kirkwood/board-iomega_ix2_200.c
index 22b86494671f,e4ed62c28f54..f655b2637b0e
--- a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
+++ b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
@@@ -10,11 -10,10 +10,9 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/platform_device.h>
  #include <linux/mv643xx_eth.h>
  #include <linux/ethtool.h>
- #include <mach/kirkwood.h>
  #include "common.h"
 -#include "mpp.h"
  
  static struct mv643xx_eth_platform_data iomega_ix2_200_ge00_data = {
  	.phy_addr       = MV643XX_ETH_PHY_NONE,
diff --cc arch/arm/mach-kirkwood/board-lsxl.c
index d60cdab46f4b,64e5cc6b6d5f..4ec8b7ae784a
--- a/arch/arm/mach-kirkwood/board-lsxl.c
+++ b/arch/arm/mach-kirkwood/board-lsxl.c
@@@ -14,12 -14,11 +14,8 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/platform_device.h>
- #include <linux/mtd/partitions.h>
- #include <linux/ata_platform.h>
- #include <linux/spi/flash.h>
- #include <linux/spi/spi.h>
  #include <linux/mv643xx_eth.h>
 -#include <linux/gpio.h>
 -#include <linux/gpio-fan.h>
  #include "common.h"
 -#include "mpp.h"
  
  static struct mv643xx_eth_platform_data lsxl_ge00_data = {
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),