diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2008-11-06 21:53:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 00:41:20 +0100 |
| commit | 990e194e69009028e029b7d25da68c38241ec4f0 (patch) | |
| tree | 633cb49307dcbac72c524a5e62ec2ce88befed1d | |
| parent | fat: document additional vfat mount options (diff) | |
| download | linux-990e194e69009028e029b7d25da68c38241ec4f0.tar.xz linux-990e194e69009028e029b7d25da68c38241ec4f0.zip | |
fat: move fs/vfat/* and fs/msdos/* to fs/fat
This just moves those files, but change link order from MSDOS, VFAT to
VFAT, MSDOS.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/Makefile | 2 | ||||
| -rw-r--r-- | fs/fat/Makefile | 6 | ||||
| -rw-r--r-- | fs/fat/namei_msdos.c (renamed from fs/msdos/namei.c) | 0 | ||||
| -rw-r--r-- | fs/fat/namei_vfat.c (renamed from fs/vfat/namei.c) | 0 | ||||
| -rw-r--r-- | fs/msdos/Makefile | 7 | ||||
| -rw-r--r-- | fs/vfat/Makefile | 7 |
6 files changed, 5 insertions, 17 deletions
diff --git a/fs/Makefile b/fs/Makefile index 2168c902d5ca..d9f8afe6f0c4 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -81,8 +81,6 @@ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_FAT_FS) += fat/ -obj-$(CONFIG_MSDOS_FS) += msdos/ -obj-$(CONFIG_VFAT_FS) += vfat/ obj-$(CONFIG_BFS_FS) += bfs/ obj-$(CONFIG_ISO9660_FS) += isofs/ obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ diff --git a/fs/fat/Makefile b/fs/fat/Makefile index bfb5f06cf2c8..e06190322c1c 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -3,5 +3,9 @@ # obj-$(CONFIG_FAT_FS) += fat.o +obj-$(CONFIG_VFAT_FS) += vfat.o +obj-$(CONFIG_MSDOS_FS) += msdos.o -fat-objs := cache.o dir.o fatent.o file.o inode.o misc.o +fat-y := cache.o dir.o fatent.o file.o inode.o misc.o +vfat-y := namei_vfat.o +msdos-y := namei_msdos.o diff --git a/fs/msdos/namei.c b/fs/fat/namei_msdos.c index e844b9809d27..e844b9809d27 100644 --- a/fs/msdos/namei.c +++ b/fs/fat/namei_msdos.c diff --git a/fs/vfat/namei.c b/fs/fat/namei_vfat.c index 155c10b4adbd..155c10b4adbd 100644 --- a/fs/vfat/namei.c +++ b/fs/fat/namei_vfat.c diff --git a/fs/msdos/Makefile b/fs/msdos/Makefile deleted file mode 100644 index ea67646fcb95..000000000000 --- a/fs/msdos/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for the Linux msdos filesystem routines. -# - -obj-$(CONFIG_MSDOS_FS) += msdos.o - -msdos-y := namei.o diff --git a/fs/vfat/Makefile b/fs/vfat/Makefile deleted file mode 100644 index 40f2798a4f08..000000000000 --- a/fs/vfat/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Makefile for the linux vfat-filesystem routines. -# - -obj-$(CONFIG_VFAT_FS) += vfat.o - -vfat-y := namei.o |