[parisc-linux-cvs] DIFF -pa61 backout valid_io_address() in parport_gsc
Grant Grundler
grundler@puffin.external.hp.com
Wed, 17 Oct 2001 14:37:06 -0600
Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.172
diff -u -p -r1.172 Makefile
--- Makefile 2001/10/17 20:02:27 1.172
+++ Makefile 2001/10/17 20:34:00
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 9
-EXTRAVERSION = -pa60
+EXTRAVERSION = -pa61
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: drivers/parport/parport_gsc.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/parport/parport_gsc.c,v
retrieving revision 1.17
diff -u -p -r1.17 parport_gsc.c
--- parport_gsc.c 2001/10/17 20:02:30 1.17
+++ parport_gsc.c 2001/10/17 20:34:00
@@ -479,7 +479,8 @@ static int __devinit parport_init_chip(s
/* some older machines with ASP-chip don't support
* the enhanced parport modes.
*/
- if (boot_cpu_data.cpu_type > pcxt && valid_io_addr(port+4)) {
+ if (boot_cpu_data.cpu_type > pcxt && !pdc_add_valid( (void *)(port+4))) {
+
/* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */
printk("%s: initialize bidirectional-mode.\n", __FUNCTION__);
parport_writeb ( (0x10 + 0x20), port + 4);