From: Charles Manning Date: Wed, 15 Dec 2010 02:19:48 +0000 (+1300) Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2 X-Git-Tag: linux-mainline-patchset-4~5^2~9 X-Git-Url: http://aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=8e5cc8c9287bcb8a409c6e60719f011213bc7aee;hp=0d3edaead59b80265308f08d7ad3a8a41ad99de1 Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2 --- diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c index 9eb6030..c879f57 100644 --- a/yaffs_yaffs1.c +++ b/yaffs_yaffs1.c @@ -110,7 +110,6 @@ int yaffs1_scan(struct yaffs_dev *dev) */ deleted++; dev->n_free_chunks++; - /*T((" %d %d deleted\n",blk,c)); */ } else if (!tags.chunk_used) { /* An unassigned chunk in the block * This means that either the block is empty or @@ -178,7 +177,6 @@ int yaffs1_scan(struct yaffs_dev *dev) } } - /* T((" %d %d data %d %d\n",blk,c,tags.obj_id,tags.chunk_id)); */ } else { /* chunk_id == 0, so it is an ObjectHeader. * Thus, we read in the object header and make the object