commit | 37620fda5c6cf45fc90705d9d403724ff0e73954 | [log] [tgz] |
---|---|---|
author | Wolfgang Denk <wd@denx.de> | Mon Apr 28 12:07:34 2008 +0200 |
committer | Wolfgang Denk <wd@denx.de> | Mon Apr 28 12:07:34 2008 +0200 |
tree | 39856574d419042f17c68c3f7e424063316dbb53 | |
parent | 08e0bdea63e8fa45b68f810bc02d56b0d9840de2 [diff] | |
parent | 63e2a882db7d5d2bed7c7c4e44a841f99ad551a0 [diff] |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
diff --git a/include/common.h b/include/common.h index f12e3bd..a6c966c 100644 --- a/include/common.h +++ b/include/common.h
@@ -214,9 +214,7 @@ char * strmhz(char *buf, long hz); int last_stage_init(void); extern ulong monitor_flash_len; -#ifdef CFG_ID_EEPROM int mac_read_from_eeprom(void); -#endif /* common/flash.c */ void flash_perror (int);