Merge with git://www.denx.de/git/u-boot.git
diff --git a/board/netstal/common/nm_bsp.c b/board/netstal/common/nm_bsp.c
index 1e06780..a9de45e 100644
--- a/board/netstal/common/nm_bsp.c
+++ b/board/netstal/common/nm_bsp.c
@@ -21,7 +21,7 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#ifdef CONFIG_CMD_BSP
 /*
  * Command nm_bsp: Netstal Maschinen BSP specific command
  */