diff options
| author | jkim <jkim@FreeBSD.org> | 2010-01-21 21:14:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-01-21 21:14:28 +0000 |
| commit | fa5d03cca6e75599903d9e88eb88558b07b57224 (patch) | |
| tree | 88dae9a5d7e108bfbd0e233fac4e5d043718b0b2 /sys/dev/acpica/Osd | |
| parent | 83fed061c4fe4086f0414be4bd83235282f469cb (diff) | |
| download | FreeBSD-src-fa5d03cca6e75599903d9e88eb88558b07b57224.zip FreeBSD-src-fa5d03cca6e75599903d9e88eb88558b07b57224.tar.gz | |
Merge ACPICA 20100121.
Diffstat (limited to 'sys/dev/acpica/Osd')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdHardware.c | 2 | ||||
| -rw-r--r-- | sys/dev/acpica/Osd/OsdSchedule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index cf3cdd7..822bf78 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -145,7 +145,7 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, void *Value, ACPI_STATUS AcpiOsWritePciConfiguration (ACPI_PCI_ID *PciId, UINT32 Register, - ACPI_INTEGER Value, UINT32 Width) + UINT64 Value, UINT32 Width) { u_int32_t byte_width = Width / 8; diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c index b8153a3..70717d5 100644 --- a/sys/dev/acpica/Osd/OsdSchedule.c +++ b/sys/dev/acpica/Osd/OsdSchedule.c @@ -215,7 +215,7 @@ AcpiOsExecute(ACPI_EXECUTE_TYPE Type, ACPI_OSD_EXEC_CALLBACK Function, } void -AcpiOsSleep(ACPI_INTEGER Milliseconds) +AcpiOsSleep(UINT64 Milliseconds) { int timo; |
