--- ./drivers/base/fs.c~	Wed Jan 30 08:08:03 2002
+++ ./drivers/base/fs.c	Wed Jan 30 08:13:21 2002
@@ -8,7 +8,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 extern struct driver_file_entry * device_default_files[];
 
--- ./drivers/base/core.c~	Wed Jan 30 08:08:03 2002
+++ ./drivers/base/core.c	Wed Jan 30 08:12:29 2002
@@ -7,7 +7,7 @@
 
 #include <linux/device.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #undef DEBUG
 
--- ./drivers/video/riva/fbdev.c~	Thu Nov 15 01:52:20 2001
+++ ./drivers/video/riva/fbdev.c	Wed Jan 30 08:18:09 2002
@@ -1811,7 +1811,7 @@
 	info = &rinfo->info;
 
 	strcpy(info->modename, rinfo->drvr_name);
-	info->node = -1;
+	info->node = NODEV;
 	info->flags = FBINFO_FLAG_DEFAULT;
 	info->fbops = &riva_fb_ops;