From: Timothy Manning Date: Thu, 28 Oct 2010 02:05:47 +0000 (+1300) Subject: Merge branch 'timothy' X-Git-Tag: linux-mainline-patchset-4~146 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=470ba34cc1d593fca7cd98bb9a385a100f7cb3ac;hp=-c;ds=inline Merge branch 'timothy' --- 470ba34cc1d593fca7cd98bb9a385a100f7cb3ac diff --combined direct/python/Makefile index c3bb981,8922e41..f2eac15 --- a/direct/python/Makefile +++ b/direct/python/Makefile @@@ -40,19 -40,19 +40,19 @@@ COMMONTESTOBJS = yaffscfg2k.o yramsim. yaffs_norif1.o ynorsim.o \ yaffs_bitmap.o \ yaffs_verify.o \ - yaffs_yaffs1.o yaffs_yaffs2.o + yaffs_yaffs1.o yaffs_yaffs2.o - YAFFSLIBOBJS = $(COMMONTESTOBJS) yaffs_python_helper.o + YAFFSLIBOBJS = $(COMMONTESTOBJS) yaffs_python_helper.o yaffs_error_converter.o -YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \ - yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h yaffs_nandemul2k.h \ +YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \ + yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h yaffs_list.h \ yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ - yaffs_qsort.c yaffs_qsort.h yaffs_trace.h \ + yaffs_qsort.h yaffs_trace.h \ yaffs_allocator.c yaffs_allocator.h \ yaffs_yaffs1.c yaffs_yaffs1.h \ yaffs_yaffs2.c yaffs_yaffs2.h \ @@@ -62,7 -62,7 +62,7 @@@ YAFFSDIRECTSYMLINKS = yaffsfs.c yaffsfs.h yaffscfg.h yaffs_malloc.h ydirectenv.h \ yaffs_flashif.c yaffs_flashif.h yaffs_flashif2.h\ - yaffs_nandif.c yaffs_nandif.h + yaffs_nandif.c yaffs_nandif.h yaffs_qsort.c yaffs_nandemul2k.h DIRECTEXTRASYMLINKS = yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\ yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \