moving files from yaffs2/direct/ to yaffs2/ and deleting all symlinks

Signed-off-by: NWilliam Juul <william.juul@tandberg.com>

Makefile

@@ -210,7 +210,7 @@ LIBS += cpu/ixp/npe/libnpe.a
 endif
 LIBS += lib_$(ARCH)/lib$(ARCH).a
 LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
-	fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/direct/libyaffs2.a
+	fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/libyaffs2.a
 LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
@@ -378,7 +378,7 @@ TAG_SUBDIRS += fs/cramfs
 TAG_SUBDIRS += fs/fat
 TAG_SUBDIRS += fs/fdos
 TAG_SUBDIRS += fs/jffs2
-TAG_SUBDIRS += fs/yaffs2/direct
+TAG_SUBDIRS += fs/yaffs2
 TAG_SUBDIRS += net
 TAG_SUBDIRS += disk
 TAG_SUBDIRS += common

fs/Makefile

@@ -22,7 +22,7 @@
 #
 #
 
-SUBDIRS	:= jffs2 cramfs fdos fat reiserfs ext2 yaffs2/direct
+SUBDIRS	:= jffs2 cramfs fdos fat reiserfs ext2 yaffs2
 
 $(obj).depend all:
 	@for dir in $(SUBDIRS) ; do \

fs/yaffs2/direct/Makefile → fs/yaffs2/Makefile

@@ -30,14 +30,8 @@ COBJS-$(CONFIG_YAFFS2) := \
 SRCS    := $(COBJS-y:.o=.c)
 OBJS    := $(addprefix $(obj),$(COBJS-y))
 
-SYMLINKS = 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 \
-          yaffs_nand.c yaffs_nand.h yaffs_mtdif.c yaffs_mtdif.h \
-          yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
-          yaffs_qsort.c yaffs_qsort.h yaffs_mtdif2.c yaffs_mtdif2.h
-
 # -DCONFIG_YAFFS_NO_YAFFS1
-CFLAGS +=    -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE -DLINUX_VERSION_CODE=0x20616 
+CFLAGS +=    -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE -DLINUX_VERSION_CODE=0x20622 
 
 all:  $(LIB)
 

fs/yaffs2/direct/devextras.h

-../devextras.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_checkptrw.c

-../yaffs_checkptrw.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_checkptrw.h

-../yaffs_checkptrw.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_ecc.c

-../yaffs_ecc.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_ecc.h

-../yaffs_ecc.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_guts.c

-../yaffs_guts.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_guts.h

-../yaffs_guts.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_mtdif.c

-../yaffs_mtdif.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_mtdif.h

-../yaffs_mtdif.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_mtdif2.c

-../yaffs_mtdif2.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_mtdif2.h

-../yaffs_mtdif2.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_nand.c

-../yaffs_nand.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_nand.h

-../yaffs_nand.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_nandemul2k.h

-../yaffs_nandemul2k.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_packedtags1.c

-../yaffs_packedtags1.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_packedtags1.h

-../yaffs_packedtags1.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_packedtags2.c

-../yaffs_packedtags2.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_packedtags2.h

-../yaffs_packedtags2.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_qsort.c

-../yaffs_qsort.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_qsort.h

-../yaffs_qsort.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_tagscompat.c

-../yaffs_tagscompat.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_tagscompat.h

-../yaffs_tagscompat.h
\ No newline at end of file

fs/yaffs2/direct/yaffs_tagsvalidity.c

-../yaffs_tagsvalidity.c
\ No newline at end of file

fs/yaffs2/direct/yaffs_tagsvalidity.h

-../yaffs_tagsvalidity.h
\ No newline at end of file

fs/yaffs2/direct/yaffsinterface.h

-../yaffsinterface.h
\ No newline at end of file

fs/yaffs2/direct/yportenv.h

-../yportenv.h
\ No newline at end of file