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>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
index 88b0788bacae..728e86d33f0c 100644
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -79,7 +79,7 @@ static struct platform_device netspace_v2_gpio_buttons = {
         .name           = "gpio-keys",
         .id             = -1,
         .dev            = {
-                .platform_data  = &netspace_v2_button_data,
+                .platform_data  = &netspace_v2_button_data,
         },
 };
 
@@ -211,7 +211,7 @@ static unsigned int netspace_v2_mpp_config[] __initdata = {
         MPP29_GPIO,             /* Blue led (slow register) */
         MPP30_GPIO,             /* Blue led (command register) */
         MPP31_GPIO,             /* Board power off */
-        MPP32_GPIO,             /* Power button (0 = Released, 1 = Pushed) */
+        MPP32_GPIO,             /* Power button (0 = Released, 1 = Pushed) */
         MPP33_GPO,              /* Fan speed (bit 2) */
         0
 };