diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /fs/ntfs | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/Makefile | 5 | ||||
| -rw-r--r-- | fs/ntfs/fs.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile index 9e7ab2eaf..66c1b17a4 100644 --- a/fs/ntfs/Makefile +++ b/fs/ntfs/Makefile @@ -1,8 +1,9 @@ # Rules for making the NTFS driver O_TARGET := ntfs.o -O_OBJS := fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o -M_OBJS := $(O_TARGET) + +obj-y := fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o +obj-m := $(O_TARGET) EXTRA_CFLAGS = -DNTFS_IN_LINUX_KERNEL -DNTFS_VERSION=\"000607\" include $(TOPDIR)/Rules.make diff --git a/fs/ntfs/fs.c b/fs/ntfs/fs.c index ad99eb13b..f54a7eb57 100644 --- a/fs/ntfs/fs.c +++ b/fs/ntfs/fs.c @@ -601,7 +601,7 @@ static int ntfs_readpage(struct file *file, struct page *page) static int ntfs_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) { return cont_prepare_write(page,from,to,ntfs_get_block, - &((struct inode*)page->mapping->host)->u.ntfs_i.mmu_private); + &page->mapping->host->u.ntfs_i.mmu_private); } static int _ntfs_bmap(struct address_space *mapping, long block) { @@ -963,8 +963,10 @@ static void __exit exit_ntfs_fs(void) EXPORT_NO_SYMBOLS; MODULE_AUTHOR("Martin von Löwis"); MODULE_DESCRIPTION("NTFS driver"); +#ifdef DEBUG MODULE_PARM(ntdebug, "i"); MODULE_PARM_DESC(ntdebug, "Debug level"); +#endif module_init(init_ntfs_fs) module_exit(exit_ntfs_fs) |