summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2007-11-29 03:21:21 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-29 20:24:52 +0300
commita7839e960675b549f06209d18283d5cee2ce9261 (patch)
tree53c3a72760fdcc4b4fb18a15ef7ce83c314c854a /include
parent2c80b01beae3db9f99a161ec216405dd694bc4c2 (diff)
downloadlinux-a7839e960675b549f06209d18283d5cee2ce9261.tar.xz
PNP: increase the maximum number of resources
On some systems the number of resources(IO,MEM) returnedy by PNP device is greater than the PNP constant, for example motherboard devices. It brings that some resources can't be reserved and resource confilicts. This will cause PCI resources are assigned wrongly in some systems, and cause hang. This is a regression since we deleted ACPI motherboard driver and use PNP system driver. [akpm@linux-foundation.org: fix text and coding-style a bit] Signed-off-by: Li Shaohua <shaohua.li@intel.com> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Thomas Renninger <trenn@suse.de> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pnp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 664d68cb1fbd..0a0426c2867d 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -13,8 +13,8 @@
#include <linux/errno.h>
#include <linux/mod_devicetable.h>
-#define PNP_MAX_PORT 8
-#define PNP_MAX_MEM 4
+#define PNP_MAX_PORT 24
+#define PNP_MAX_MEM 12
#define PNP_MAX_IRQ 2
#define PNP_MAX_DMA 2
#define PNP_NAME_LEN 50