diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/char/pcmcia/serial_cb.c | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/char/pcmcia/serial_cb.c')
| -rw-r--r-- | drivers/char/pcmcia/serial_cb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/serial_cb.c b/drivers/char/pcmcia/serial_cb.c index 8a2dede85..b0d8b02a8 100644 --- a/drivers/char/pcmcia/serial_cb.c +++ b/drivers/char/pcmcia/serial_cb.c @@ -2,7 +2,7 @@ A driver for CardBus serial devices - serial_cb.c 1.14 1999/11/11 02:18:08 + serial_cb.c 1.15 1999/11/24 02:52:06 Copyright 1998, 1999 by Donald Becker and David Hinds @@ -39,7 +39,7 @@ static int pc_debug = PCMCIA_DEBUG; MODULE_PARM(pc_debug, "i"); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = -"serial_cb.c 1.14 1999/11/11 02:18:08 (David Hinds)"; +"serial_cb.c 1.15 1999/11/24 02:52:06 (David Hinds)"; #else #define DEBUG(n, args...) #endif @@ -56,8 +56,9 @@ static void device_setup(u_char bus, u_char devfn, u_int ioaddr) pcibios_read_config_word(bus, devfn, PCI_SUBSYSTEM_VENDOR_ID, &a); pcibios_read_config_word(bus, devfn, PCI_SUBSYSTEM_ID, &b); - if ((a == 0x13a2) && (b == 0x8007)) { - /* Ositech Jack of Spades */ + if (((a == 0x13a2) && (b == 0x8007)) || + ((a == 0x1420) && (b == 0x8003))) { + /* Ositech, Psion 83c175-based cards */ DEBUG(0, " 83c175 NVCTL_m = 0x%4.4x.\n", inl(ioaddr+0x80)); outl(0x4C00, ioaddr + 0x80); outl(0x4C80, ioaddr + 0x80); |