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

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
index f58d2e1a4042..61c4b189d067 100644
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@ -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));
 }