diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
| commit | 3917ac5846dd0f9ad1238166f90caab9912052e6 (patch) | |
| tree | 1c298935def4f29edb39192365a65d73de999155 /drivers/scsi/ppa.c | |
| parent | af2f803c8b2d469fe38e4a7ce952658dfcb6681a (diff) | |
o Merge with Linux 2.1.100.
o Cleanup the machine dependencies of floppy and rtc. The driver for
the Dallas thingy in the Indy is still missing.
o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
o Page colouring shit to match the virtual and physical colour of all
mapped pages. This tends to produce extreme fragmentation problems,
so it's deactivated for now. Users of R4000SC / R4400SC may re-enable
the code in arch/mips/mm/init.c by removing the definition of
CONF_GIVE_A_SHIT_ABOUT_COLOURS. Should get them somewhat further -
but don't shake to hard ...
o Fixed ptrace(2)-ing of syscalls, strace is now working again.
o Fix the interrupt forwarding from the keyboard driver to the psaux
driver, PS/2 mice are now working on the Indy. The fix is somewhat
broken as it prevents generic kernels for Indy and machines which handle
things different.
o Things I can't remember.
Diffstat (limited to 'drivers/scsi/ppa.c')
| -rw-r--r-- | drivers/scsi/ppa.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index ebdcb560c..5e67230e3 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c @@ -50,13 +50,6 @@ NULL, /* cur_cmd */ \ #include "ppa.h" #include <linux/parport.h> -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#ifndef PARPORT_MODULES -#define PARPORT_MODULES "parport_pc" -#endif -#endif - #define NO_HOSTS 4 static ppa_struct ppa_hosts[NO_HOSTS] = {PPA_EMPTY, PPA_EMPTY, PPA_EMPTY, PPA_EMPTY}; @@ -98,7 +91,6 @@ static int ppa_pb_claim(int host_no) return 1; } - PPA_BASE(host_no) = ppa_hosts[host_no].dev->port->base; if (ppa_hosts[host_no].cur_cmd) ppa_hosts[host_no].cur_cmd->SCp.phase++; return 0; @@ -130,12 +122,8 @@ int ppa_detect(Scsi_Host_Template * host) nhosts = 0; try_again = 0; -#ifdef CONFIG_KMOD - if (!pb) { - request_module(PARPORT_MODULES); + if (!pb) pb = parport_enumerate(); - } -#endif if (!pb) { printk("ppa: parport reports no devices.\n"); @@ -155,7 +143,7 @@ int ppa_detect(Scsi_Host_Template * host) if (ppa_pb_claim(i)) while (ppa_hosts[i].p_busy) schedule(); /* Whe can safe schedule() here */ - ppb = PPA_BASE(i); + ppb = PPA_BASE(i) = ppa_hosts[i].dev->port->base; w_ctr(ppb, 0x0c); modes = ppa_hosts[i].dev->port->modes; |