Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d98eb5cf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/cleanup 

From Jason Cooper:
orion cleanup for v3.8

 - remove unused includes in kirkwood
 - fix sparse warnings in kirkwood
 - checkpatch cleanup in kirkwood
 - use common code in pcie on kirkwood

* tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux:
  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
parents 0f9cb211 4a9329a0

arch/arm/mach-kirkwood/board-dockstar.c

+0 −13
Original line number Diff line number Diff line
@@ -16,21 +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 <linux/gpio.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"

arch/arm/mach-kirkwood/board-dreamplug.c

+0 −15
Original line number Diff line number Diff line
@@ -13,23 +13,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 <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"

arch/arm/mach-kirkwood/board-dt.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = { 
	{ }

};



struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {

static struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),

	OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",

		       NULL),
@@ -98,7 +98,7 @@ static void __init kirkwood_dt_init(void) 
			     kirkwood_auxdata_lookup, NULL);

}



static const char *kirkwood_dt_board_compat[] = {

static const char * const kirkwood_dt_board_compat[] = {

	"globalscale,dreamplug",

	"dlink,dns-320",

	"dlink,dns-325",

arch/arm/mach-kirkwood/board-goflexnet.c

+0 −13
Original line number Diff line number Diff line
@@ -18,21 +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 <linux/gpio.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"

arch/arm/mach-kirkwood/board-ib62x0.c

+0 −6
Original line number Diff line number Diff line
@@ -13,15 +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"