diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
| commit | e1150713a203c7b933939d575ea80f12c6877665 (patch) | |
| tree | e90efa2f0b6a55e4114028b09fc286948d8516ea /sys/i386/acpica | |
| parent | 5577165db58ddb7157c690a8eabdb3df64d3ca38 (diff) | |
| download | FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.zip FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020404 import.
Diffstat (limited to 'sys/i386/acpica')
| -rw-r--r-- | sys/i386/acpica/OsdEnvironment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c index 6ba605a..cb7f869 100644 --- a/sys/i386/acpica/OsdEnvironment.c +++ b/sys/i386/acpica/OsdEnvironment.c @@ -56,7 +56,7 @@ AcpiOsTerminate(void) ACPI_STATUS AcpiOsGetRootPointer( UINT32 Flags, - ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress) + ACPI_POINTER *RsdpPhysicalAddress) { /* * The loader passes the physical address at which it found the |
