From 56d5d0b9e35acf6f378e270c2b8ef75033aead5c Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Fri, 28 Dec 2012 15:08:50 +0100
Subject: [PATCH] --- yaml --- r: 359941 b: refs/heads/master c:
 b4d2a24fa522afd3891c9718443686cab71df24f h: refs/heads/master i:   359939:
 e2d697f16b121ef16923328bf447309fdac962e9 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-nsa310.dts | 5 +++++
 trunk/arch/arm/mach-kirkwood/board-nsa310.c | 6 ------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b00653ca5e48..1f50612bdfe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dcc628349de9a878c43ef4b30e6c8ccbe1d207a
+refs/heads/master: b4d2a24fa522afd3891c9718443686cab71df24f
diff --git a/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts b/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts
index 85cce36491da..dbb3551017fe 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -29,6 +29,11 @@
 
 		i2c@11000 {
 			status = "okay";
+
+			adt7476: adt7476a@2e {
+				compatible = "adt7476";
+				reg = <0x2e>;
+			};
 		};
 
 		nand@3000000 {
diff --git a/trunk/arch/arm/mach-kirkwood/board-nsa310.c b/trunk/arch/arm/mach-kirkwood/board-nsa310.c
index cf2c78cf6513..6966c86e0c34 100644
--- a/trunk/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/trunk/arch/arm/mach-kirkwood/board-nsa310.c
@@ -36,15 +36,9 @@ static unsigned int nsa310_mpp_config[] __initdata = {
 	0
 };
 
-static struct i2c_board_info __initdata nsa310_i2c_info[] = {
-	{ I2C_BOARD_INFO("adt7476", 0x2e) },
-};
-
 void __init nsa310_init(void)
 {
 	kirkwood_mpp_conf(nsa310_mpp_config);
-
-	i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info));
 }
 
 static int __init nsa310_pci_init(void)