summaryrefslogtreecommitdiff
path: root/include/image.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-12 20:39:27 +0200
committerStefan Roese <sr@denx.de>2008-08-12 20:39:27 +0200
commit9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch)
tree40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /include/image.h
parent1c7015100a620582224f25eb057573a0fe147648 (diff)
parentcd82919e6c8a73b363a26f34b734923844e52d1c (diff)
downloadu-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip
u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.gz
u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'include/image.h')
-rw-r--r--include/image.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/image.h b/include/image.h
index 46138fa..4b9c582 100644
--- a/include/image.h
+++ b/include/image.h
@@ -220,7 +220,6 @@ typedef struct bootm_headers {
#endif
int verify; /* getenv("verify")[0] != 'n' */
- int autostart; /* getenv("autostart")[0] != 'n' */
struct lmb *lmb; /* for memory mgmt */
} bootm_headers_t;