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

[karo-tx-uboot.git] / common / env_nowhere.c

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 75ef78de87753e36bf314eaf6ae1784ec79d27e0..8a3ca1978ff329b87d33a2ea01cdf14105a9c294 100644 (file)
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -31,9 +31,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr = NULL;
-
-extern uchar default_environment[];
+env_t *env_ptr;
 
 void env_relocate_spec(void)
 {
@@ -41,7 +39,7 @@ void env_relocate_spec(void)
 
 uchar env_get_char_spec(int index)
 {
-       return ( *((uchar *)(gd->env_addr + index)) );
+       return *((uchar *)(gd->env_addr + index));
 }
 
 /*
@@ -51,8 +49,8 @@ uchar env_get_char_spec(int index)
  */
 int env_init(void)
 {
-       gd->env_addr  = (ulong)&default_environment[0];
-       gd->env_valid = 0;
+       gd->env_addr    = (ulong)&default_environment[0];
+       gd->env_valid   = 0;
 
-       return (0);
+       return 0;
 }