diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2007-11-28 16:21:21 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-14 09:51:00 -0800 |
| commit | fc175adc1c935ea8679d76a78d7a58df34af16eb (patch) | |
| tree | 9d2467a86ba2917bc251bfcf940c0ea9fa3b249e /include | |
| parent | a6eda373a0fe1c4d169d0ec081518d68323428ab (diff) | |
PNP: increase the maximum number of resources
patch a7839e960675b549f06209d18283d5cee2ce9261 in mainline.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pnp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 16b46aace34..62decabd38f 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 |