[U-Boot-Users] Fix some compile problems introduced by the latest CFG_CMD_xxx cleanup

[Stefan Roese]

Signed-off-by: Stefan Roese <sr at denx.de>

---
commit 21b5c73cf1edfe437ddd7df0c4829063600d03ea
tree 2bf23095eebda168b3e4c7e3f4ad7f686342614d
parent e9514751cfa5cce61ea699fa0d3eb37898a5eeb5
author Stefan Roese <sr at denx.de> Wed, 11 Jul 2007 12:12:25 +0200
committer Stefan Roese <sr at denx.de> Wed, 11 Jul 2007 12:12:25 +0200

 common/cmd_flash.c  |    2 +-
 common/cmd_nvedit.c |    5 ++---
 drivers/macb.c      |    2 +-
 net/nfs.c           |    3 +--
 net/sntp.c          |    3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index db38f94..11c8857 100644
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -33,7 +33,7 @@
 
 #if defined(CONFIG_CMD_FLASH)
 
-#if (defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
 #include <jffs2/jffs2.h>
 
 /* parition handling routines */
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index e313f2c..de5a514 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -538,7 +538,7 @@ int getenv_r (char *name, char *buf, unsigned len)
 	return (-1);
 }
 
-#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \
+#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -550,7 +550,6 @@ int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return (saveenv() ? 1 : 0);
 }
 
-
 #endif
 
 
@@ -594,7 +593,7 @@ U_BOOT_CMD(
 	"    - delete environment variable 'name'\n"
 );
 
-#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \
+#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
 U_BOOT_CMD(
diff --git a/drivers/macb.c b/drivers/macb.c
index ffb5f74..bf7853a 100644
--- a/drivers/macb.c
+++ b/drivers/macb.c
@@ -18,7 +18,7 @@
 #include <common.h>
 
 #if defined(CONFIG_MACB) \
-	&& (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
+	&& (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII))
 
 /*
  * The u-boot networking stack is a little weird.  It seems like the
diff --git a/net/nfs.c b/net/nfs.c
index 30a897d..df2caac 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -31,8 +31,7 @@
 
 /*#define NFS_DEBUG*/
 
-#if (defined(CONFIG_CMD_NET) \
-    && defined(CONFIG_CMD_NFS)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS)
 
 #define HASHES_PER_LINE 65	/* Number of "loading" hashes per line	*/
 #define NFS_TIMEOUT 60
diff --git a/net/sntp.c b/net/sntp.c
index 0a7f478..95e7542 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -12,8 +12,7 @@
 
 #include "sntp.h"
 
-#if (defined(CONFIG_CMD_NET) \
-    && defined(CONFIG_CMD_SNTP)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
 
 #define SNTP_TIMEOUT 10