--- linux-2.4.2-orig/include/linux/acpi.h	Tue Feb 27 20:30:51 2001
+++ linux/include/linux/acpi.h	Sat Mar  3 20:48:55 2001
@@ -160,4 +160,6 @@
 
 #define ACPI_SLP_TYP_DISABLED	(~0UL)
 
+int pnpbios_register_driver(char *pnpid,  void (*callback)(int iolo, int iohi, int irq, int dma));
+
 #endif /* _LINUX_ACPI_H */
--- linux-2.4.2-orig/drivers/parport/parport_pc.c	Tue Feb 27 20:30:46 2001
+++ linux/drivers/parport/parport_pc.c	Sat Mar  3 20:46:01 2001
@@ -60,6 +60,10 @@
 #include <linux/parport_pc.h>
 #include <asm/parport.h>
 
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
+
 #define PARPORT_PC_MAX_PORTS PARPORT_MAX
 
 /* ECR modes */
@@ -1395,6 +1399,22 @@
 }
 #endif /* CONFIG_PARPORT_PC_SUPERIO */
 
+static void __devinit set_superio_hint(int io,int irq,int dma)
+{	int i=0;
+
+	while((superios[i].io!= 0) && (i<NR_SUPERIOS))
+		i++;
+	if(i==NR_SUPERIOS) {
+		printk("Super-IO: too many chips!\n");
+		return;
+	}
+	superios[i].io = io;
+	superios[i].irq = irq;
+	superios[i].dma = dma;
+}
+
+
+
 static int __devinit get_superio_dma (struct parport *p)
 {
 	int i=0;
@@ -2579,6 +2599,23 @@
 	return count;
 }
 
+#ifdef CONFIG_ACPI
+void pnp0400_found(int lo, int hi, int irq, int dma)
+{
+        printk("parport: PNP0400 found by ACPI: io=0x%04x irq=%d dma=No\n",
+                lo, irq );
+	set_superio_hint(lo,irq,PARPORT_DMA_NONE);
+}
+
+void pnp0401_found(int lo, int hi, int irq, int dma)
+{
+	printk("parport: PNP0401 found by ACPI: io=%04x,%04x irq=%d dma=%d\n",
+		lo, hi, irq, dma);
+	set_superio_hint(lo,irq,dma);
+}
+
+#endif 
+
 /* This function is called by parport_pc_init if the user didn't
  * specify any ports to probe.  Its job is to find some ports.  Order
  * is important here -- we want ISA ports to be registered first,
@@ -2596,6 +2633,12 @@
 #ifdef CONFIG_PARPORT_PC_SUPERIO
 	detect_and_report_winbond ();
 	detect_and_report_smsc ();
+#endif
+
+#ifdef CONFIG_ACPI
+	/* Ask ACPI */
+	pnpbios_register_driver("PNP0400", &pnp0400_found);
+	pnpbios_register_driver("PNP0401", &pnp0401_found);
 #endif
 
 	/* Onboard SuperIO chipsets that show themselves on the PCI bus. */
--- linux-2.4.2-orig/drivers/acpi/driver.c	Tue Feb 27 20:30:43 2001
+++ linux/drivers/acpi/driver.c	Sat Mar  3 20:38:49 2001
@@ -46,6 +46,8 @@
 #define _COMPONENT	OS_DEPENDENT
 	MODULE_NAME	("driver")
 
+int acpi_active=0;
+
 struct acpi_run_entry
 {
 	void (*callback)(void*);
@@ -490,6 +492,8 @@
 	acpi_ec_init();
 	acpi_power_init();
 
+	acpi_active=1;
+
 	/* 
 	 * Non-intuitive: 0 means pwr and sleep are implemented using the fixed
 	 * feature model, so we install handlers. 1 means a control method
@@ -588,6 +592,8 @@
 	pm_idle = NULL;
 	pm_power_off = NULL;
 	pm_active = 0;
+
+	acpi_active = 0;
 }
 
 module_init(acpi_init);
--- linux-2.4.2-orig/drivers/acpi/pnpbios.c	Sat Mar  3 21:11:23 2001
+++ linux/drivers/acpi/pnpbios.c	Sat Mar  3 20:50:03 2001
@@ -0,0 +1,73 @@
+/*
+ *  pnpbios.c - PnP Support for on-board devices
+ *
+ *  Currently used by parport_pc.c
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/acpi.h>
+#include <linux/slab.h>
+#include "acpi.h"
+
+
+static ACPI_STATUS found_pnp( ACPI_HANDLE handle, u32 level, void *ctx, void **value);
+
+
+int pnpbios_register_driver( char *pnpid, void (*callback)(int iolo, int iohi, int irq, int dma))
+{
+	if(acpi_active)
+	    acpi_get_devices(pnpid, found_pnp, callback, NULL);
+	return 0;
+}
+
+
+static ACPI_STATUS
+found_pnp(
+        ACPI_HANDLE handle,
+        u32 level,
+        void *ctx,
+        void **value)
+{ 
+        ACPI_BUFFER buf;
+        RESOURCE *res;
+	int iolo=-1, iohi=-1, irq=-1, dma=-1;
+
+        buf.length = 0;
+        buf.pointer = NULL;
+        if (acpi_get_current_resources(handle, &buf) != AE_BUFFER_OVERFLOW)
+                return AE_OK;
+
+        buf.pointer = kmalloc(buf.length, GFP_KERNEL);
+        if (!buf.pointer)
+                return AE_NO_MEMORY;
+
+        if (!ACPI_SUCCESS(acpi_get_current_resources(handle, &buf))) {
+                kfree(buf.pointer);
+                return AE_OK;
+        }
+
+
+        res = (RESOURCE*) buf.pointer;
+
+	while ( ((void *)res < buf.pointer + buf.length) &&
+		res->length >0 ) {
+	    if(res->id == 0) irq =res->data.irq.interrupts[0];
+	    if(res->id == 1) dma =res->data.dma.channels[0];
+	    if(res->id == 4) {
+			if(iolo==-1) 
+				iolo= res->data.io.min_base_address;
+			else
+				iohi= res->data.io.min_base_address;
+	    }
+	    res = NEXT_RESOURCE(res);
+	}
+
+        kfree(buf.pointer);
+
+	 (( void (*) (int ,int, int, int))  ctx)(iolo,iohi,irq,dma);
+	return 0;
+}
+
+EXPORT_SYMBOL(pnpbios_register_driver);
+
--- linux-2.4.2-orig/drivers/acpi/include/acglobal.h	Tue Feb 27 20:30:33 2001
+++ linux/drivers/acpi/include/acglobal.h	Sat Mar  3 20:38:08 2001
@@ -39,6 +39,8 @@
 #define ACPI_EXTERN extern
 #endif
 
+extern int acpi_active;		// is ACPI initialized and active ?
+
 
 extern      NATIVE_CHAR                 *msg_acpi_error_break;