summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ppa.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-18 17:17:51 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-18 17:17:51 +0000
commitf1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch)
tree225271a3d5dcd4e9dea5ee393556abd754c964b1 /drivers/scsi/ppa.c
parent135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff)
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a bit more credible ...
Diffstat (limited to 'drivers/scsi/ppa.c')
-rw-r--r--drivers/scsi/ppa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 3c2f083bd..ebdcb560c 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -50,8 +50,8 @@ NULL, /* cur_cmd */ \
#include "ppa.h"
#include <linux/parport.h>
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
#ifndef PARPORT_MODULES
#define PARPORT_MODULES "parport_pc"
#endif
@@ -130,7 +130,7 @@ int ppa_detect(Scsi_Host_Template * host)
nhosts = 0;
try_again = 0;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (!pb) {
request_module(PARPORT_MODULES);
pb = parport_enumerate();