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

Commit 1576a31c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'cleanup_for_v3.9_round2' of... 

Merge tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into next/cleanup

From Jason Cooper:
cleanup for v3.9 round2
 - remove unneeded #includes for mach-dove
 - remove unneeded #includes and code for the nsa310

* tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux:
  ARM: dove: cleanup includes
  ARM: kirkwood: nsa310: cleanup includes and unneeded code
parents 00f4c14d 63a06973

arch/arm/mach-dove/common.c

+9 −20
Original line number Diff line number Diff line
@@ -8,35 +8,24 @@ 
 * warranty of any kind, whether express or implied.

 */



#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/pci.h>

#include <linux/clk-provider.h>

#include <linux/clk/mvebu.h>

#include <linux/ata_platform.h>

#include <linux/gpio.h>

#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <asm/page.h>

#include <asm/setup.h>

#include <asm/timex.h>

#include <linux/platform_data/dma-mv_xor.h>

#include <linux/platform_data/usb-ehci-orion.h>

#include <linux/platform_device.h>

#include <asm/hardware/cache-tauros2.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <asm/mach/pci.h>

#include <mach/dove.h>

#include <mach/pm.h>

#include <mach/bridge-regs.h>

#include <asm/mach/arch.h>

#include <linux/irq.h>

#include <plat/time.h>

#include <linux/platform_data/usb-ehci-orion.h>

#include <linux/platform_data/dma-mv_xor.h>

#include <plat/irq.h>

#include <mach/pm.h>

#include <plat/common.h>

#include <plat/addr-map.h>

#include <plat/irq.h>

#include <plat/time.h>

#include "common.h"



/*****************************************************************************

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

+1 −8
Original line number Diff line number Diff line
@@ -10,12 +10,9 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/gpio.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <mach/kirkwood.h>

#include <linux/of.h>

#include "common.h"

#include "mpp.h"
@@ -79,14 +76,10 @@ static void __init nsa310_gpio_init(void) 


void __init nsa310_init(void)

{

	u32 dev, rev;



	kirkwood_mpp_conf(nsa310_mpp_config);



	nsa310_gpio_init();



	kirkwood_pcie_id(&dev, &rev);



	i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info));

}