From: Timothy Manning Date: Thu, 25 Nov 2010 23:38:46 +0000 (+1300) Subject: yaffs fixed some merge issues in direct/timothy_tests/quick_tests X-Git-Tag: linux-mainline-patchset-4~51 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=3003894b7f0b20840de894a634d047133027e48f;hp=004928b472529f4331c5c80a20cea902e1cdc328 yaffs fixed some merge issues in direct/timothy_tests/quick_tests Signed-off-by: Timothy Manning --- diff --git a/direct/timothy_tests/quick_tests/Makefile b/direct/timothy_tests/quick_tests/Makefile index 70750a1..e018dc9 100644 --- a/direct/timothy_tests/quick_tests/Makefile +++ b/direct/timothy_tests/quick_tests/Makefile @@ -63,7 +63,7 @@ TESTFILES = quick_tests.o lib.o \ test_yaffs_fstat.o test_yaffs_fstat_EBADF.o \ test_yaffs_close_EBADF.o\ test_yaffs_chmod.o test_yaffs_chmod_ENOENT.o test_yaffs_chmod_ENOTDIR.o test_yaffs_chmod_EINVAL.o \ - test_yaffs_chmod_ENOENT2.o test_yaffs_chmod_ELOOP.o\ + test_yaffs_chmod_ENOENT2.o test_yaffs_chmod_ELOOP.o test_yaffs_chmod_EROFS.o \ test_yaffs_fchmod.o test_yaffs_fchmod_EBADF.o\ test_yaffs_fsync.o test_yaffs_fsync_EBADF.o \ test_yaffs_fdatasync.o test_yaffs_fdatasync_EBADF.o \