Contents of /trunk/kernel26-alx/patches-2.6.23-r1/0111-2.6.23.12-all-fixes.patch
Parent Directory
| 
Revision Log
Revision 658 -
(show annotations)
(download)
Mon Jun 23 21:39:39 2008 UTC (15 years, 10 months ago) by niro
File size: 2038 byte(s)
Mon Jun 23 21:39:39 2008 UTC (15 years, 10 months ago) by niro
File size: 2038 byte(s)
2.6.23-alx-r1: new default as we fix the via epia clocksource=tsc quircks -linux-2.6.23.17 -fbcondecor-0.9.4 -squashfs-3.3 -unionfs-2.3.3 -ipw3945-1.2.2 -mptbase-vmware fix
| 1 | diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c |
| 2 | index 5abf5ea..0e3b8d0 100644 |
| 3 | --- a/drivers/pnp/pnpacpi/rsparser.c |
| 4 | +++ b/drivers/pnp/pnpacpi/rsparser.c |
| 5 | @@ -82,11 +82,9 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, |
| 6 | while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) && |
| 7 | i < PNP_MAX_IRQ) |
| 8 | i++; |
| 9 | - if (i >= PNP_MAX_IRQ) { |
| 10 | - printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ " |
| 11 | - "resources: %d \n", PNP_MAX_IRQ); |
| 12 | + if (i >= PNP_MAX_IRQ) |
| 13 | return; |
| 14 | - } |
| 15 | + |
| 16 | res->irq_resource[i].flags = IORESOURCE_IRQ; // Also clears _UNSET flag |
| 17 | res->irq_resource[i].flags |= irq_flags(triggering, polarity); |
| 18 | irq = acpi_register_gsi(gsi, triggering, polarity); |
| 19 | @@ -165,9 +163,6 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, |
| 20 | } |
| 21 | res->dma_resource[i].start = dma; |
| 22 | res->dma_resource[i].end = dma; |
| 23 | - } else { |
| 24 | - printk(KERN_ERR "pnpacpi: exceeded the max number of DMA " |
| 25 | - "resources: %d \n", PNP_MAX_DMA); |
| 26 | } |
| 27 | } |
| 28 | |
| 29 | @@ -189,9 +184,6 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res, |
| 30 | } |
| 31 | res->port_resource[i].start = io; |
| 32 | res->port_resource[i].end = io + len - 1; |
| 33 | - } else { |
| 34 | - printk(KERN_ERR "pnpacpi: exceeded the max number of IO " |
| 35 | - "resources: %d \n", PNP_MAX_PORT); |
| 36 | } |
| 37 | } |
| 38 | |
| 39 | @@ -215,9 +207,6 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res, |
| 40 | |
| 41 | res->mem_resource[i].start = mem; |
| 42 | res->mem_resource[i].end = mem + len - 1; |
| 43 | - } else { |
| 44 | - printk(KERN_ERR "pnpacpi: exceeded the max number of mem " |
| 45 | - "resources: %d\n", PNP_MAX_MEM); |
| 46 | } |
| 47 | } |
| 48 | |
| 49 | diff --git a/include/linux/pnp.h b/include/linux/pnp.h |
| 50 | index 62decab..16b46aa 100644 |
| 51 | --- a/include/linux/pnp.h |
| 52 | +++ b/include/linux/pnp.h |
| 53 | @@ -13,8 +13,8 @@ |
| 54 | #include <linux/errno.h> |
| 55 | #include <linux/mod_devicetable.h> |
| 56 | |
| 57 | -#define PNP_MAX_PORT 24 |
| 58 | -#define PNP_MAX_MEM 12 |
| 59 | +#define PNP_MAX_PORT 8 |
| 60 | +#define PNP_MAX_MEM 4 |
| 61 | #define PNP_MAX_IRQ 2 |
| 62 | #define PNP_MAX_DMA 2 |
| 63 | #define PNP_NAME_LEN 50 |