Merge branch 'drm-ttm-unmappable' into drm-core-next

[pandora-kernel.git] / fs / hpfs / buffer.c

diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c
index 2807aa8..eac5f96 100644 (file)
--- a/fs/hpfs/buffer.c
+++ b/fs/hpfs/buffer.c
@@ -5,7 +5,8 @@
  *
  *  general buffer i/o
  */
-
+#include <linux/sched.h>
+#include <linux/slab.h>
 #include "hpfs_fn.h"
 
 void hpfs_lock_creation(struct super_block *s)
@@ -76,7 +77,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe
                return NULL;
        }
 
-       qbh->data = data = (char *)kmalloc(2048, GFP_NOFS);
+       qbh->data = data = kmalloc(2048, GFP_NOFS);
        if (!data) {
                printk("HPFS: hpfs_map_4sectors: out of memory\n");
                goto bail;