diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 14:53:13 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 14:53:13 -0800 |
| commit | 1576a31c61d41a0bb549a3aabd10f42c5e233de4 (patch) | |
| tree | 43cd8164937a8c5950c96d1d267c59b0739792f9 /arch/arm/mach-kirkwood | |
| parent | 00f4c14d183fe78814de57ca651829603f8b1459 (diff) | |
| parent | 63a069739a5826ab4007da88b7ec71eb9909271c (diff) | |
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
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/board-nsa310.c | 9 |
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 f58d2e1a404..61c4b189d06 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)); } |