From: Len Brown <len.brown@intel.com>
Date: Mon, 15 Aug 2005 20:07:26 +0000 (-0400)
Subject: Merge from-linus to-akpm
X-Git-Tag: v2.6.14-rc1~256^2~14^2~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=09d92002718edf8ef284ec3726247acc83efbbe0;p=linux-2.6-omap-h63xx.git

Merge from-linus to-akpm
---

09d92002718edf8ef284ec3726247acc83efbbe0
diff --cc drivers/acpi/motherboard.c
index e10fb4f842b,61ea70742d4..e928e8c2c6e
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@@ -42,7 -43,8 +42,7 @@@ ACPI_MODULE_NAME("acpi_motherboard"
   */
  #define IS_RESERVED_ADDR(base, len) \
  	(((len) > 0) && ((base) > 0) && ((base) + (len) < IO_SPACE_LIMIT) \
- 	&& ((base) + (len) > 0x1000))
+ 	&& ((base) + (len) > PCIBIOS_MIN_IO))
 -
  /*
   * Clearing the flag (IORESOURCE_BUSY) allows drivers to use
   * the io ports if they really know they can use it, while