aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-01-23 14:58:21 -0500
committerJason Cooper <jason@lakedaemon.net>2013-01-29 14:37:30 -0500
commit92cb76254fbc818c02dbc771f296844f4ccc468c (patch)
treeb8151d199fe32f1066a819b39f3ef3f01eff534a
parentb96e1b1c3c5319294edb0970b6d5bf099c0e85eb (diff)
ARM: kirkwood: nsa310: cleanup includes and unneeded code
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>
-rw-r--r--arch/arm/mach-kirkwood/board-nsa310.c9
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 @@
10 10
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/i2c.h>
14#include <linux/gpio.h> 13#include <linux/gpio.h>
15
16#include <asm/mach-types.h>
17#include <asm/mach/arch.h>
18#include <mach/kirkwood.h> 14#include <mach/kirkwood.h>
15#include <linux/of.h>
19#include "common.h" 16#include "common.h"
20#include "mpp.h" 17#include "mpp.h"
21 18
@@ -79,14 +76,10 @@ static void __init nsa310_gpio_init(void)
79 76
80void __init nsa310_init(void) 77void __init nsa310_init(void)
81{ 78{
82 u32 dev, rev;
83
84 kirkwood_mpp_conf(nsa310_mpp_config); 79 kirkwood_mpp_conf(nsa310_mpp_config);
85 80
86 nsa310_gpio_init(); 81 nsa310_gpio_init();
87 82
88 kirkwood_pcie_id(&dev, &rev);
89
90 i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info)); 83 i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info));
91} 84}
92 85