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

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

diff --combined arch/arm/mach-dove/common.c
index 0c7911b3e155bf8b9227b9b41408019c202ddaf7,be887feea8283428abef9149be4f7ea9a4ed8221..ea84c535a110100a2e77650cf5d3f94403363ad6
--- 1/arch/arm/mach-dove/common.c
--- 2/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@@ -8,35 -8,24 +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"
  
  /*****************************************************************************
@@@ -242,13 -231,17 +231,13 @@@ static int __init dove_find_tclk(void
        return 166666667;
  }
  
 -static void __init dove_timer_init(void)
 +void __init dove_timer_init(void)
  {
        dove_tclk = dove_find_tclk();
        orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
                        IRQ_DOVE_BRIDGE, dove_tclk);
  }
  
 -struct sys_timer dove_timer = {
 -      .init = dove_timer_init,
 -};
 -
  /*****************************************************************************
   * Cryptographic Engines and Security Accelerator (CESA)
   ****************************************************************************/
@@@ -450,7 -443,7 +439,7 @@@ DT_MACHINE_START(DOVE_DT, "Marvell Dov
        .map_io         = dove_map_io,
        .init_early     = dove_init_early,
        .init_irq       = orion_dt_init_irq,
 -      .timer          = &dove_timer,
 +      .init_time      = dove_timer_init,
        .init_machine   = dove_dt_init,
        .restart        = dove_restart,
        .dt_compat      = dove_dt_board_compat,