diff options
author | jkim <jkim@FreeBSD.org> | 2010-08-06 23:11:19 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2010-08-06 23:11:19 +0000 |
commit | 68285361e2b84f72f44b4146a32b9766dd28f986 (patch) | |
tree | f23a6c8653185991db3060ec1e51cb28fba3d4c0 /sys/dev | |
parent | 94aa0856b20dcf5a4113d4857128a63927c65c49 (diff) | |
parent | 7246513d8afc4166ea14544296293fcb8df78649 (diff) | |
download | FreeBSD-src-68285361e2b84f72f44b4146a32b9766dd28f986.zip FreeBSD-src-68285361e2b84f72f44b4146a32b9766dd28f986.tar.gz |
Merge ACPICA 20100806.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/acpica/Osd/OsdHardware.c | 2 | ||||
-rw-r--r-- | sys/dev/acpica/Osd/OsdMemory.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index 98f17a0..15ab026 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -89,7 +89,7 @@ AcpiOsWritePort(ACPI_IO_ADDRESS OutPort, UINT32 Value, UINT32 Width) } ACPI_STATUS -AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, void *Value, +AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, UINT64 *Value, UINT32 Width) { diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c index c039b52..4b7eca2 100644 --- a/sys/dev/acpica/Osd/OsdMemory.c +++ b/sys/dev/acpica/Osd/OsdMemory.c @@ -74,12 +74,6 @@ AcpiOsGetPhysicalAddress(void *LogicalAddress, return (AE_BAD_ADDRESS); } -ACPI_STATUS -AcpiOsValidateInterface (char *Interface) -{ - return (AE_SUPPORT); -} - BOOLEAN AcpiOsReadable (void *Pointer, ACPI_SIZE Length) { |