Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[karo-tx-uboot.git] / fs / reiserfs / dev.c

diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c
index 72d62a659b02770a0286ae47a8a324ca9ef47d38..46dc41463f130d7deafe892dab657f53b74c3391 100644 (file)
--- a/fs/reiserfs/dev.c
+++ b/fs/reiserfs/dev.c
@@ -19,7 +19,7 @@
 
 
 #include <common.h>
-#if (CONFIG_COMMANDS & CFG_CMD_REISER)
+#if defined(CONFIG_CMD_REISER)
 
 #include <config.h>
 #include <reiserfs.h>
@@ -35,7 +35,7 @@ int reiserfs_set_blk_dev(block_dev_desc_t *rbdd, int part)
        reiserfs_block_dev_desc = rbdd;
 
        if (part == 0) {
-               /* disk doesn't use partition table */
+               /* disk doesn't use partition table */
                part_info.start = 0;
                part_info.size = rbdd->lba;
                part_info.blksz = rbdd->blksz;
@@ -62,7 +62,7 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
        if (sector < 0
            || ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
            >= part_info.size)) {
-//             errnum = ERR_OUTSIDE_PART;
+/*             errnum = ERR_OUTSIDE_PART; */
                printf (" ** reiserfs_devread() read outside partition\n");
                return 0;
        }
@@ -120,4 +120,4 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
        return 1;
 }
 
-#endif /* CFG_CMD_REISERFS */
+#endif