summaryrefslogtreecommitdiffstats
path: root/common/cmd_reiser.c
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2007-08-03 02:23:23 -0500
committerAndrew Fleming-AFLEMING <afleming@freescale.com>2007-08-03 02:23:23 -0500
commit6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch)
tree4bc9e1362c3090bb6d2df71109228ca61b8d00ce /common/cmd_reiser.c
parent5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff)
parent5dc210dec5bace98a50b6ba905347890091a9bb0 (diff)
downloadbootable_bootloader_goldelico_gta04-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.zip
bootable_bootloader_goldelico_gta04-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.gz
bootable_bootloader_goldelico_gta04-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.bz2
Merge branch 'testing' into working
Conflicts: CHANGELOG fs/fat/fat.c include/configs/MPC8560ADS.h include/configs/pcs440ep.h net/eth.c
Diffstat (limited to 'common/cmd_reiser.c')
-rw-r--r--common/cmd_reiser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c
index d83c31a..1ba3929 100644
--- a/common/cmd_reiser.c
+++ b/common/cmd_reiser.c
@@ -28,7 +28,7 @@
*/
#include <common.h>
-#if (CONFIG_COMMANDS & CFG_CMD_REISER)
+#if defined(CONFIG_CMD_REISER)
#include <config.h>
#include <command.h>
#include <image.h>
@@ -240,4 +240,4 @@ U_BOOT_CMD(
" to address 'addr' from dos filesystem\n"
);
-#endif /* CONFIG_COMMANDS & CFG_CMD_REISER */
+#endif