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

This commit is contained in:
Tom Rini 2013-03-10 09:47:50 -04:00
commit c02bff3617

View File

@ -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);
* 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) {