Commit 95ab363c authored by Andy Grover's avatar Andy Grover

Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi
parents 93e50e5e 4b17adc5
...@@ -143,9 +143,9 @@ acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) ...@@ -143,9 +143,9 @@ acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
#ifdef CONFIG_ACPI_EFI #ifdef CONFIG_ACPI_EFI
addr->pointer_type = ACPI_PHYSICAL_POINTER; addr->pointer_type = ACPI_PHYSICAL_POINTER;
if (efi.acpi20) if (efi.acpi20)
addr->pointer.physical = (ACPI_PHYSICAL_ADDRESS) virt_to_phys(efi.acpi20); addr->pointer.physical = (acpi_physical_address) virt_to_phys(efi.acpi20);
else if (efi.acpi) else if (efi.acpi)
addr->pointer.physical = (ACPI_PHYSICAL_ADDRESS) virt_to_phys(efi.acpi); addr->pointer.physical = (acpi_physical_address) virt_to_phys(efi.acpi);
else { else {
printk(KERN_ERR PREFIX "System description tables not found\n"); printk(KERN_ERR PREFIX "System description tables not found\n");
return AE_NOT_FOUND; return AE_NOT_FOUND;
......
...@@ -185,7 +185,7 @@ acpi_pci_bind ( ...@@ -185,7 +185,7 @@ acpi_pci_bind (
*/ */
data->dev = pci_find_slot(data->id.bus, PCI_DEVFN(data->id.device, data->id.function)); data->dev = pci_find_slot(data->id.bus, PCI_DEVFN(data->id.device, data->id.function));
if (!data->dev) { if (!data->dev) {
ACPI_DEBUG_PRINT((ACPI_DB_WARN, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Device %02x:%02x:%02x.%02x not present in PCI namespace\n", "Device %02x:%02x:%02x.%02x not present in PCI namespace\n",
data->id.segment, data->id.bus, data->id.segment, data->id.bus,
data->id.device, data->id.function)); data->id.device, data->id.function));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment