diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-01-23 14:58:21 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-01-31 09:23:20 -0500 |
commit | 7e5fa2f0aa14fde4e981143bf4635217c0883833 (patch) | |
tree | de8fc1027f3cd5f1e4e4e07afd4b14bc60627109 | |
parent | b96e1b1c3c5319294edb0970b6d5bf099c0e85eb (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.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c index f58d2e1a4042..2fa71400ecb3 100644 --- a/arch/arm/mach-kirkwood/board-nsa310.c +++ b/arch/arm/mach-kirkwood/board-nsa310.c | |||
@@ -12,10 +12,8 @@ | |||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
14 | #include <linux/gpio.h> | 14 | #include <linux/gpio.h> |
15 | |||
16 | #include <asm/mach-types.h> | ||
17 | #include <asm/mach/arch.h> | ||
18 | #include <mach/kirkwood.h> | 15 | #include <mach/kirkwood.h> |
16 | #include <linux/of.h> | ||
19 | #include "common.h" | 17 | #include "common.h" |
20 | #include "mpp.h" | 18 | #include "mpp.h" |
21 | 19 | ||
@@ -79,14 +77,10 @@ static void __init nsa310_gpio_init(void) | |||
79 | 77 | ||
80 | void __init nsa310_init(void) | 78 | void __init nsa310_init(void) |
81 | { | 79 | { |
82 | u32 dev, rev; | ||
83 | |||
84 | kirkwood_mpp_conf(nsa310_mpp_config); | 80 | kirkwood_mpp_conf(nsa310_mpp_config); |
85 | 81 | ||
86 | nsa310_gpio_init(); | 82 | nsa310_gpio_init(); |
87 | 83 | ||
88 | kirkwood_pcie_id(&dev, &rev); | ||
89 | |||
90 | i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info)); | 84 | i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info)); |
91 | } | 85 | } |
92 | 86 | ||