commit e2573d54c484345a551fc4d861b623f8c1528468
author Tom Rini <trini@ti.com> Sun Mar 10 09:47:50 2013 -0400
committer Tom Rini <trini@ti.com> Sun Mar 10 09:47:50 2013 -0400
tree b32c581fd3046824436192029aa3f4c9d6f5e1ed
parent f66154694a35408e4c090cf0ec10dd33a47a655e
parent 1179c28c8581c08e7540f5afca4983d5304c49a3

Merge branch 'master' of git://git.denx.de/u-boot-mpc82xx

board/keymile/km82xx/km82xx.c

diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c
index defc885..f98844d 100644
--- a/board/keymile/km82xx/km82xx.c
+++ b/board/keymile/km82xx/km82xx.c
@@ -31,10 +31,7 @@
 #include <libfdt.h>
 #endif
 
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
 #include <i2c.h>
-#endif
-
 #include "../common/common.h"
 
 /*
@@ -370,7 +367,7 @@
  * will toggle once what forces the mgocge3un part to restart
  * immediately.
  */
-void handle_mgcoge3un_reset(void)
+static void handle_mgcoge3un_reset(void)
 {
 	char *bobcatreset = getenv("bobcatreset");
 	if (bobcatreset) {