projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-marvell
[platform/kernel/u-boot.git]
/
common
/
env_eeprom.c
diff --git
a/common/env_eeprom.c
b/common/env_eeprom.c
index
95a7d0d
..
8fe59f8
100644
(file)
--- a/
common/env_eeprom.c
+++ b/
common/env_eeprom.c
@@
-32,11
+32,6
@@
#include <i2c.h>
#endif
-#ifdef CONFIG_ENV_OFFSET_REDUND
-#define ACTIVE_FLAG 1
-#define OBSOLETE_FLAG 0
-#endif
-
DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr = NULL;
@@
-281,4
+276,3
@@
int env_init(void)
return (0);
}
#endif
-