diff options
| author | Ben Warren <bwarren@qstreams.com> | 2007-08-13 21:26:03 -0400 |
|---|---|---|
| committer | Ben Warren <bwarren@qstreams.com> | 2007-08-13 21:26:03 -0400 |
| commit | d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995 (patch) | |
| tree | dd0722cee4758fe40f6a5cc75986ebb1a395aac2 /fs/ext2/ext2fs.c | |
| parent | f539edc076cfe52bff919dd512ba8d7af0e22092 (diff) | |
| parent | 8a92b7c60b40ff79e2cc96e13aeac2a531dde473 (diff) | |
| download | olio-uboot-2014.01-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.tar.xz olio-uboot-2014.01-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.zip | |
Sync'd u-boot-net with mainline
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/bcm570x.c
drivers/tigon3.c
Diffstat (limited to 'fs/ext2/ext2fs.c')
| -rw-r--r-- | fs/ext2/ext2fs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index 9cf2fb7ba..513a2f9e3 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -25,7 +25,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_EXT2) +#if defined(CONFIG_CMD_EXT2) #include <ext2fs.h> #include <malloc.h> #include <asm/byteorder.h> @@ -875,4 +875,4 @@ fail: return (0); } -#endif /* CFG_CMD_EXT2FS */ +#endif |