patch-2.4.27 linux-2.4.27/drivers/hotplug/acpiphp_res.c

Next file: linux-2.4.27/drivers/hotplug/pci_hotplug.h
Previous file: linux-2.4.27/drivers/hotplug/acpiphp_pci.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.26/drivers/hotplug/acpiphp_res.c linux-2.4.27/drivers/hotplug/acpiphp_res.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include <linux/config.h>
+#include <linux/init.h>
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -39,7 +39,6 @@
 #include <linux/pci.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
-#include <linux/init.h>
 
 #include <linux/string.h>
 #include <linux/mm.h>
@@ -225,7 +224,7 @@
 		}  /* End of too big on top end */
 
 		/* For IO make sure it's not in the ISA aliasing space */
-		if (node->base & 0x300L)
+		if ((node->base & 0x300L) && !(node->base & 0xfffff000))
 			continue;
 
 		/* If we got here, then it is the right size

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)