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/cramfs | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/cramfs')
| -rw-r--r-- | fs/cramfs/Makefile | 4 | ||||
| -rw-r--r-- | fs/cramfs/inflate/Makefile | 4 | ||||
| -rw-r--r-- | fs/cramfs/inode.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/cramfs/Makefile b/fs/cramfs/Makefile index 9f71d0814..3db73d8ac 100644 --- a/fs/cramfs/Makefile +++ b/fs/cramfs/Makefile @@ -4,9 +4,9 @@ O_TARGET := cramfs.o -O_OBJS := inode.o uncompress.o inflate/zlib.o +obj-y := inode.o uncompress.o inflate/zlib.o -M_OBJS := $(O_TARGET) +obj-m := $(O_TARGET) include $(TOPDIR)/Rules.make diff --git a/fs/cramfs/inflate/Makefile b/fs/cramfs/inflate/Makefile index 92feb8325..5d89dc3c9 100644 --- a/fs/cramfs/inflate/Makefile +++ b/fs/cramfs/inflate/Makefile @@ -28,7 +28,7 @@ O_TARGET := zlib.o -O_OBJS := adler32.o infblock.o infcodes.o inffast.o inflate.o \ - inftrees.o infutil.o uncompr.o +obj-y := adler32.o infblock.o infcodes.o inffast.o inflate.o \ + inftrees.o infutil.o uncompr.o include $(TOPDIR)/Rules.make diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 51eff1caa..3ce1b2e01 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -306,7 +306,7 @@ static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry) static int cramfs_readpage(struct file *file, struct page * page) { - struct inode *inode = (struct inode*)page->mapping->host; + struct inode *inode = page->mapping->host; u32 maxblock, bytes_filled; maxblock = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; |