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
Pull release into acpica branch
[pandora-kernel.git]
/
drivers
/
char
/
hpet.c
diff --git
a/drivers/char/hpet.c
b/drivers/char/hpet.c
index
3808d95
..
5172d4e
100644
(file)
--- a/
drivers/char/hpet.c
+++ b/
drivers/char/hpet.c
@@
-937,7
+937,7
@@
static acpi_status hpet_resources(struct acpi_resource *res, void *data)
iounmap(hdp->hd_address);
return -EBUSY;
}
iounmap(hdp->hd_address);
return -EBUSY;
}
- } else if (res->
id
== ACPI_RSTYPE_FIXED_MEM32) {
+ } else if (res->
type
== ACPI_RSTYPE_FIXED_MEM32) {
struct acpi_resource_fixed_mem32 *fixmem32;
fixmem32 = &res->data.fixed_memory32;
struct acpi_resource_fixed_mem32 *fixmem32;
fixmem32 = &res->data.fixed_memory32;
@@
-954,7
+954,7
@@
static acpi_status hpet_resources(struct acpi_resource *res, void *data)
iounmap(hdp->hd_address);
return -EBUSY;
}
iounmap(hdp->hd_address);
return -EBUSY;
}
- } else if (res->
id
== ACPI_RSTYPE_EXT_IRQ) {
+ } else if (res->
type
== ACPI_RSTYPE_EXT_IRQ) {
struct acpi_resource_ext_irq *irqp;
int i;
struct acpi_resource_ext_irq *irqp;
int i;