ARM: kirkwood: nsa310: cleanup includes and unneeded code
authorJason Cooper <jason@lakedaemon.net>
Wed, 23 Jan 2013 19:58:21 +0000 (19:58 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 31 Jan 2013 14:23:20 +0000 (14:23 +0000)
After removing the unneeded linux/i2c.h, linux/of.h was needed for
of_machine_is_compatible().  i2c.h had included of.h.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/mach-kirkwood/board-nsa310.c

index f58d2e1a40422e06346387350298ee08f233bb0c..2fa71400ecb3af1eb395a84035bcbe4e96c1f64c 100644 (file)
 #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 +77,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));
 }