patch-2.1.108 linux/drivers/char/fbmem.c

Next file: linux/drivers/char/lp.c
Previous file: linux/drivers/char/conmakehash.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.107/linux/drivers/char/fbmem.c linux/drivers/char/fbmem.c
@@ -23,8 +23,8 @@
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
 #endif
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
 #endif
 
 #ifdef __mc68000__
@@ -262,7 +262,7 @@
     }
 }
 
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
 static void try_to_load(int fb)
 {
 	char modname[16];
@@ -337,7 +337,7 @@
 		    return -EINVAL;
 		if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
 		    return -EINVAL;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
 		if (!registered_fb[con2fb.framebuffer])
 		    try_to_load(con2fb.framebuffer);
 #endif
@@ -419,7 +419,7 @@
 	int fbidx = GET_FB_IDX(inode->i_rdev);
 	struct fb_info *info;
 
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
 	if (!(info = registered_fb[fbidx]))
 		try_to_load(fbidx);
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov