diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:12:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:12:23 +0200 |
| commit | cfcfdff59b411249d7c660dcf08a9a3f3df9e641 (patch) | |
| tree | c12d4e2a03dacd62e4656991bdff64c20eca8c1c /drivers/pnp/quirks.c | |
| parent | d3794979a8a80c222ce9d016a6dfc4bed36965d0 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/percputip-core-percpu-2008-06-16_09.12_Mon
Diffstat (limited to 'drivers/pnp/quirks.c')
| -rw-r--r-- | drivers/pnp/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index e2b7de4cb05e..1ff3bb585ab2 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -286,7 +286,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev) pci_name(pdev), i, (unsigned long long) pci_start, (unsigned long long) pci_end); - res->flags = 0; + res->flags |= IORESOURCE_DISABLED; } } } |