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/jffs | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/jffs')
| -rw-r--r-- | fs/jffs/Makefile | 4 | ||||
| -rw-r--r-- | fs/jffs/inode-v23.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs/Makefile b/fs/jffs/Makefile index 541816171..29bc24d6f 100644 --- a/fs/jffs/Makefile +++ b/fs/jffs/Makefile @@ -30,7 +30,7 @@ endif endif O_TARGET := jffs.o -M_OBJS := $(O_TARGET) -O_OBJS := jffs_fm.o intrep.o $(INODE_O) +obj-m := $(O_TARGET) +obj-y := jffs_fm.o intrep.o $(INODE_O) include $(TOPDIR)/Rules.make diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index f61005aac..94fd0797d 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c @@ -697,7 +697,7 @@ jffs_readpage(struct file *file, struct page *page) void *buf; unsigned long read_len; int result = -EIO; - struct inode *inode = (struct inode*)page->mapping->host; + struct inode *inode = page->mapping->host; struct jffs_file *f = (struct jffs_file *)inode->u.generic_ip; struct jffs_control *c = (struct jffs_control *)inode->i_sb->u.generic_sbp; int r; |