patch-2.1.90 linux/drivers/video/fbcon.c
Next file: linux/fs/buffer.c
Previous file: linux/drivers/sound/v_midi.c
Back to the patch index
Back to the overall index
- Lines: 56
- Date:
Tue Mar 10 14:43:13 1998
- Orig file:
v2.1.89/linux/drivers/video/fbcon.c
- Orig date:
Mon Nov 24 01:18:56 1997
diff -u --recursive --new-file v2.1.89/linux/drivers/video/fbcon.c linux/drivers/video/fbcon.c
@@ -74,8 +74,8 @@
#include <linux/vt_kern.h>
#include <linux/selection.h>
#include <linux/init.h>
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
#endif
#include <asm/irq.h>
@@ -196,7 +196,7 @@
static struct display_switch *probe_list(struct display_switch *dispsw,
struct display *disp);
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
static void request_driver(struct display *disp, int is_accel);
#endif
static struct display_switch *fbcon_get_driver(struct display *disp);
@@ -1368,7 +1368,7 @@
}
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
static void request_driver(struct display *disp, int is_accel)
{
char modname[30];
@@ -1400,7 +1400,7 @@
len += sprintf(modname+len, "-%d", disp->var.accel);
request_module(modname);
}
-#endif /* CONFIG_KERNELD */
+#endif /* CONFIG_KMOD */
static struct display_switch *fbcon_get_driver(struct display *disp)
@@ -1410,7 +1410,7 @@
if (disp->var.accel != FB_ACCEL_NONE) {
/* First try an accelerated driver */
dispsw = probe_list(accel_drivers, disp);
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (!dispsw) {
request_driver(disp, 1);
dispsw = probe_list(accel_drivers, disp);
@@ -1422,7 +1422,7 @@
/* Then try an unaccelerated driver */
dispsw = probe_list(drivers, disp);
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (!dispsw) {
request_driver(disp, 0);
dispsw = probe_list(drivers, disp);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov