Here's the missing part of the parport patch. Tested on i386.
Tim.
*/
Index: linux/include/asm-alpha/parport.h
diff -u linux/include/asm-alpha/parport.h:1.1.1.3 linux/include/asm-alpha/parport.h:1.3
--- linux/include/asm-alpha/parport.h:1.1.1.3 Mon Feb 28 09:32:46 2000
+++ linux/include/asm-alpha/parport.h Tue Mar 7 16:33:28 2000
@@ -1,7 +1,7 @@
/*
* parport.h: platform-specific PC-style parport initialisation
*
- * Copyright (C) 1999 Tim Waugh <tim@cyberelk.demon.co.uk>
+ * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
*
* This file should only be included by drivers/parport/parport_pc.c.
*/
@@ -25,8 +25,6 @@
#define __maybe_init __init
#endif
-static int __maybe_init parport_pc_init_pci(int irq, int dma);
-
static int user_specified __maybe_initdata = 0;
int __init
parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
@@ -43,16 +41,12 @@
count++;
} while (*io && (++i < PARPORT_PC_MAX_PORTS));
} else {
- count += parport_pc_init_superio ();
-
- /* Probe all the likely ports. */
if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL))
count++;
- count += parport_pc_init_pci (irq[0], dma[0]);
}
return count;
Index: linux/include/asm-arm/parport.h
diff -u linux/include/asm-arm/parport.h:1.1.1.5 linux/include/asm-arm/parport.h:1.3
--- linux/include/asm-arm/parport.h:1.1.1.5 Wed Mar 1 09:35:09 2000
+++ linux/include/asm-arm/parport.h Tue Mar 7 16:33:28 2000
@@ -1,7 +1,7 @@
/*
* parport.h: ARM-specific parport initialisation
*
- * Copyright (C) 1999 Tim Waugh <tim@cyberelk.demon.co.uk>
+ * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
*
* This file should only be included by drivers/parport/parport_pc.c.
*/
@@ -25,9 +25,6 @@
#define __maybe_init __init
#endif
-static int __maybe_init parport_pc_init_pci(int irq, int dma);
-static int __devinit parport_pc_init_superio(void);
-
static int user_specified __maybe_initdata = 0;
@@ -46,10 +43,6 @@
count++;
} while (*io && (++i < PARPORT_PC_MAX_PORTS));
} else {
-#ifdef CONFIG_PCI
- count += parport_pc_init_superio ();
-#endif
-
/* Probe all the likely ports. */
if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
count++;
@@ -57,9 +50,6 @@
count++;
if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL))
count++;
-#ifdef CONFIG_PCI
- count += parport_pc_init_pci (irq[0], dma[0]);
-#endif
}
return count;
Index: linux/include/asm-i386/parport.h
diff -u linux/include/asm-i386/parport.h:1.1.1.4 linux/include/asm-i386/parport.h:1.3
--- linux/include/asm-i386/parport.h:1.1.1.4 Wed Mar 1 09:35:04 2000
+++ linux/include/asm-i386/parport.h Tue Mar 7 16:33:28 2000
@@ -1,7 +1,7 @@
/*
* parport.h: ia32-specific parport initialisation
*
- * Copyright (C) 1999 Tim Waugh <tim@cyberelk.demon.co.uk>
+ * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
*
* This file should only be included by drivers/parport/parport_pc.c.
*/
@@ -13,11 +13,8 @@
than PARPORT_MAX (in <linux/parport.h>). */
#define PARPORT_PC_MAX_PORTS 8
-static int parport_pc_init_pci(int irq, int dma);
-static int parport_pc_init_superio(void);
-
static int user_specified __devinitdata = 0;
-int __init
+int __devinit
parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
{
int count = 0, i = 0;
@@ -32,17 +29,12 @@
count++;
} while (*io && (++i < PARPORT_PC_MAX_PORTS));
} else {
- count += parport_pc_init_superio ();
-
if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL))
count++;
-
- /* probe for other PCI parallel devices */
- count += parport_pc_init_pci (irq[0], dma[0]);
}
return count;
Index: linux/include/asm-mips/parport.h
diff -u linux/include/asm-mips/parport.h:1.1.1.2 linux/include/asm-mips/parport.h:1.3
--- linux/include/asm-mips/parport.h:1.1.1.2 Mon Feb 28 09:32:46 2000
+++ linux/include/asm-mips/parport.h Tue Mar 7 16:33:28 2000
@@ -2,7 +2,7 @@
*
* parport.h: ia32-specific parport initialisation
*
- * Copyright (C) 1999 Tim Waugh <tim@cyberelk.demon.co.uk>
+ * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
*
* This file should only be included by drivers/parport/parport_pc.c.
*/
@@ -25,8 +25,6 @@
#define __maybe_init __init
#endif
-static int __maybe_init parport_pc_init_pci(int irq, int dma);
-
static int user_specified __maybe_initdata = 0;
int __init
parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
@@ -43,16 +41,12 @@
count++;
} while (*io && (++i < PARPORT_PC_MAX_PORTS));
} else {
- count += parport_pc_init_superio ();
-
- /* Probe all the likely ports. */
if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL))
count++;
- count += parport_pc_init_pci (irq[0], dma[0]);
}
return count;
Index: linux/include/asm-mips64/parport.h
diff -u linux/include/asm-mips64/parport.h:1.1.1.2 linux/include/asm-mips64/parport.h:1.3
--- linux/include/asm-mips64/parport.h:1.1.1.2 Mon Feb 28 09:32:52 2000
+++ linux/include/asm-mips64/parport.h Tue Mar 7 16:33:28 2000
@@ -2,7 +2,7 @@
*
* parport.h: ia32-specific parport initialisation
*
- * Copyright (C) 1999 Tim Waugh <tim@cyberelk.demon.co.uk>
+ * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
*
* This file should only be included by drivers/parport/parport_pc.c.
*/
@@ -25,8 +25,6 @@
#define __maybe_init __init
#endif
-static int __maybe_init parport_pc_init_pci(int irq, int dma);
-
static int user_specified __maybe_initdata = 0;
int __init
parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
@@ -43,16 +41,12 @@
count++;
} while (*io && (++i < PARPORT_PC_MAX_PORTS));
} else {
- count += parport_pc_init_superio ();
-
- /* Probe all the likely ports. */
if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0], NULL))
count++;
if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL))
count++;
- count += parport_pc_init_pci (irq[0], dma[0]);
}
return count;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Mar 15 2000 - 21:00:21 EST