git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
drivers
/
pnp
/
system.c
diff --git
a/drivers/pnp/system.c
b/drivers/pnp/system.c
index
8f0a570
..
764f3a3
100644
(file)
--- a/
drivers/pnp/system.c
+++ b/
drivers/pnp/system.c
@@
-60,7
+60,7
@@
static void reserve_resources_of_dev(struct pnp_dev *dev)
int i;
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
- if (res->flags & IORESOURCE_
UNSET
)
+ if (res->flags & IORESOURCE_
DISABLED
)
continue;
if (res->start == 0)
continue; /* disabled */