diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-16 01:50:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-16 01:50:18 +0100 |
| commit | e95bcc3661a78ccc094c365ecd2484d00a60f97d (patch) | |
| tree | 0987662fbde9b8792a95ff00023bc22cfbaf2528 /fs | |
| parent | 0b8f2a27861a9fd06eb55a34f855ec9c5102aab4 (diff) | |
| parent | decbe029b2a9d3333d02c433389b1c821eea96d7 (diff) | |
| download | u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.zip u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.gz u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.bz2 | |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Conflicts:
drivers/rtc/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cramfs/uncompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index 2e906eb..a9c0b7d 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c @@ -25,7 +25,7 @@ #include <watchdog.h> #include <zlib.h> -#if defined(CONFIG_CMD_JFFS2) +#if defined(CONFIG_CMD_CRAMFS) static z_stream stream; |