summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/board-nsa310.c
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-01-23 20:58:21 +0100
committerJason Cooper <jason@lakedaemon.net>2013-01-29 20:37:30 +0100
commit92cb76254fbc818c02dbc771f296844f4ccc468c (patch)
treeb8151d199fe32f1066a819b39f3ef3f01eff534a /arch/arm/mach-kirkwood/board-nsa310.c
parentARM: Kirkwood: Cleanup unneeded include files (diff)
downloadlinux-92cb76254fbc818c02dbc771f296844f4ccc468c.tar.xz
linux-92cb76254fbc818c02dbc771f296844f4ccc468c.zip
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>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-nsa310.c')
-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 @@
#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));
}