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>

diff --cc arch/arm/mach-kirkwood/board-dockstar.c
index 726cfc4,6912882..d7196db
--- 1/arch/arm/mach-kirkwood/board-dockstar.c
--- 2/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 3e2d95d,8a8ebe0..08248e2
--- 1/arch/arm/mach-kirkwood/board-dreamplug.c
--- 2/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-dt.c
Simple merge

diff --cc arch/arm/mach-kirkwood/board-goflexnet.c
index 3b96618,5dcd0d6..9db979a
--- 1/arch/arm/mach-kirkwood/board-goflexnet.c
--- 2/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 b6e5db9,6d3a564..9f6f496
--- 1/arch/arm/mach-kirkwood/board-ib62x0.c
--- 2/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 7d3c54c,24f5aa7..c8ebde4
--- 1/arch/arm/mach-kirkwood/board-iconnect.c
--- 2/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 22b8649,e4ed62c..f655b26
--- 1/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
--- 2/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 d60cdab,64e5cc6..4ec8b7a
--- 1/arch/arm/mach-kirkwood/board-lsxl.c
--- 2/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),

diff --cc arch/arm/mach-kirkwood/board-ts219.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge