diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 23:29:34 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 23:29:34 +0200 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/pnp/system.c | |
| parent | IB/umad: BKL is not needed for ib_umad_open() (diff) | |
| parent | Linux 2.6.26 (diff) | |
| download | linux-2fceef397f9880b212a74c418290ce69e7ac00eb.tar.xz linux-2fceef397f9880b212a74c418290ce69e7ac00eb.zip | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/pnp/system.c')
| -rw-r--r-- | drivers/pnp/system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c index 9c2496dbeee4..cf4e07b01d48 100644 --- a/drivers/pnp/system.c +++ b/drivers/pnp/system.c @@ -81,7 +81,7 @@ static void reserve_resources_of_dev(struct pnp_dev *dev) } for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) { - if (res->flags & IORESOURCE_UNSET) + if (res->flags & (IORESOURCE_UNSET | IORESOURCE_DISABLED)) continue; reserve_range(dev, res->start, res->end, 0); |