Skip to content
Snippets Groups Projects
Commit c02bff36 authored by Tom Rini's avatar Tom Rini
Browse files

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

parents 5a35831b 8327122b
No related branches found
No related tags found
No related merge requests found
...@@ -31,10 +31,7 @@ ...@@ -31,10 +31,7 @@
#include <libfdt.h> #include <libfdt.h>
#endif #endif
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
#include <i2c.h> #include <i2c.h>
#endif
#include "../common/common.h" #include "../common/common.h"
/* /*
...@@ -370,7 +367,7 @@ static void set_pin(int state, unsigned long mask); ...@@ -370,7 +367,7 @@ static void set_pin(int state, unsigned long mask);
* will toggle once what forces the mgocge3un part to restart * will toggle once what forces the mgocge3un part to restart
* immediately. * immediately.
*/ */
void handle_mgcoge3un_reset(void) static void handle_mgcoge3un_reset(void)
{ {
char *bobcatreset = getenv("bobcatreset"); char *bobcatreset = getenv("bobcatreset");
if (bobcatreset) { if (bobcatreset) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment