Merge branch 'origin' into kconfig-for-1.3.1

[u-boot] / cpu / ppc4xx / dcr.S

diff --git a/cpu/ppc4xx/dcr.S b/cpu/ppc4xx/dcr.S
index 554db1bc77fe483b8f368261a3b7e48a69024b26..93465a3b513759074819bd4877eec4f472b067a7 100644 (file)
--- a/cpu/ppc4xx/dcr.S
+++ b/cpu/ppc4xx/dcr.S
@@ -22,7 +22,7 @@
  */
 #include <config.h>
 
-#if defined(CONFIG_4xx) && ((CONFIG_COMMANDS & CFG_CMD_SETGETDCR) || defined(CONFIG_CMD_SETGETDCR))
+#if defined(CONFIG_4xx) && defined(CONFIG_CMD_SETGETDCR)
 
 #include <ppc4xx.h>
 
@@ -195,4 +195,4 @@ set_dcr:
                blr                             /* Return to calling function */
 .Lfe4:         .size   set_dcr,.Lfe4-set_dcr
 /* end set_dcr() */
-#endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */
+#endif