summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2011-05-03 02:15:01 +0000
committerWolfgang Denk <wd@denx.de>2011-05-10 22:46:56 +0200
commitee8bc961a47563b0e6f92f3843959304a19412dc (patch)
tree464714fcba1d7ae9facf9c05c8472e939b4b1a69 /common
parent8c65b8a937c3d717c2507e4d8ed600ec664dbf43 (diff)
downloadu-boot-imx-ee8bc961a47563b0e6f92f3843959304a19412dc.zip
u-boot-imx-ee8bc961a47563b0e6f92f3843959304a19412dc.tar.gz
u-boot-imx-ee8bc961a47563b0e6f92f3843959304a19412dc.tar.bz2
cramfs: fix bug in using CONFIG_CRAMFS_CMDLINE
do not define own flash_info variable, instead use the flash_info variable defined in your flash driver. Signed-off-by: Heiko Schocher <hs@denx.de> cc: Wolfgang Denk <wd@denx.de> cc: Detlev Zundel <dzu@denx.de> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_cramfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_cramfs.c b/common/cmd_cramfs.c
index 8c86dc5..9060ecc 100644
--- a/common/cmd_cramfs.c
+++ b/common/cmd_cramfs.c
@@ -43,7 +43,7 @@
#endif
#ifdef CONFIG_CRAMFS_CMDLINE
-flash_info_t flash_info[1];
+#include <flash.h>
#ifndef CONFIG_CMD_JFFS2
#include <linux/stat.h>