patch-2.4.2 linux/drivers/block/loop.c

• Lines: 18
• Date: Fri Feb 9 11:30:22 2001
• Orig file: v2.4.1/linux/drivers/block/loop.c
• Orig date: Fri Dec 29 14:07:21 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/block/loop.c linux/drivers/block/loop.c
@@ -4,7 +4,7 @@
  *  Written by Theodore Ts'o, 3/29/93
  * 
  * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
- * permitted under the GNU Public License.
+ * permitted under the GNU General Public License.
  *
  * DES encryption plus some minor changes by Werner Almesberger, 30-MAY-1993
  * more DES encryption plus IDEA encryption by Nicholas J. Leon, June 20, 1996
@@ -75,7 +75,7 @@
 #define TIMEOUT_VALUE (6 * HZ)
 #include <linux/blk.h>
 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 static int max_loop = 8;
 static struct loop_device *loop_dev;
 static int *loop_sizes;