From b2ad5f821b1381492d792ca10b1eb7a107b48f14 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 10 Jan 2001 17:17:53 +0000 Subject: Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your Makefiles. --- fs/qnx4/Makefile | 5 +++-- fs/qnx4/inode.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'fs/qnx4') diff --git a/fs/qnx4/Makefile b/fs/qnx4/Makefile index 943eb1223..a3a3c5a7d 100644 --- a/fs/qnx4/Makefile +++ b/fs/qnx4/Makefile @@ -8,7 +8,8 @@ # Note 2! The CFLAGS definitions are now in the main makefile... O_TARGET := qnx4.o -O_OBJS := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o -M_OBJS := $(O_TARGET) + +obj-y := inode.o dir.o namei.o file.o bitmap.o truncate.o fsync.o +obj-m := $(O_TARGET) include $(TOPDIR)/Rules.make diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 45a945209..c40f488e5 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -426,7 +426,7 @@ static int qnx4_readpage(struct file *file, struct page *page) static int qnx4_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) { return cont_prepare_write(page,from,to,qnx4_get_block, - &((struct inode*)page->mapping->host)->u.qnx4_i.mmu_private); + &page->mapping->host->u.qnx4_i.mmu_private); } static int qnx4_bmap(struct address_space *mapping, long block) { -- cgit v1.2.3