summaryrefslogtreecommitdiffstats
path: root/fs/cramfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cramfs')
-rw-r--r--fs/cramfs/Makefile4
-rw-r--r--fs/cramfs/inflate/Makefile4
-rw-r--r--fs/cramfs/inode.c2
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;