From c6459e8ec1efb4b44da408265cdadbf11438f877 Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Sat, 10 Dec 2011 16:14:23 +0100
Subject: [PATCH] acpi: resolve warnings

---
 drivers/acpi/osminixxf.c | 9 +++------
 drivers/acpi/pci.c       | 4 +++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/acpi/osminixxf.c b/drivers/acpi/osminixxf.c
index 97e6d54d8..c56d25e8d 100644
--- a/drivers/acpi/osminixxf.c
+++ b/drivers/acpi/osminixxf.c
@@ -123,7 +123,7 @@ extern struct machine machine;
 
 
 PRIVATE unsigned pci_inb(u16_t port) {
-	u32_t value;
+	unsigned long value;
 	int s;
 	if ((s=sys_inb(port, &value)) !=OK)
 		printf("ACPI: warning, sys_inb failed: %d\n", s);
@@ -131,7 +131,7 @@ PRIVATE unsigned pci_inb(u16_t port) {
 }
 
 PRIVATE unsigned pci_inw(u16_t port) {
-	u32_t value;
+	unsigned long value;
 	int s;
 	if ((s=sys_inw(port, &value)) !=OK)
 		printf("ACPI: warning, sys_inw failed: %d\n", s);
@@ -139,7 +139,7 @@ PRIVATE unsigned pci_inw(u16_t port) {
 }
 
 PRIVATE unsigned pci_inl(u16_t port) {
-	u32_t value;
+	unsigned long value;
 	int s;
 	if ((s=sys_inl(port, &value)) !=OK)
 		printf("ACPI: warning, sys_inl failed: %d\n", s);
@@ -355,9 +355,6 @@ AcpiOsVprintf (
     const char              *Fmt,
     va_list                 Args)
 {
-	INT32                   Count = 0;
-	UINT8                   Flags;
-
 
 	vprintf (Fmt, Args);
 	printf("\n");
diff --git a/drivers/acpi/pci.c b/drivers/acpi/pci.c
index 94296f62d..d4ae05609 100644
--- a/drivers/acpi/pci.c
+++ b/drivers/acpi/pci.c
@@ -91,6 +91,7 @@ map_error:
 	((struct acpi_map_bridge_resp *)m)->err = err;
 }
 
+#if 0
 PRIVATE ACPI_STATUS device_get_int(ACPI_HANDLE handle,
 				char * name,
 				ACPI_INTEGER * val)
@@ -110,6 +111,7 @@ PRIVATE ACPI_STATUS device_get_int(ACPI_HANDLE handle,
 
 	return status;
 }
+#endif
 
 PUBLIC void do_get_irq(message *m)
 {
@@ -217,7 +219,7 @@ PRIVATE ACPI_STATUS get_pci_irq_routing(struct pci_bridge * bridge)
 			continue;
 		}
 		ires.bridge = bridge;
-		ires,tbl = tbl;
+		ires.tbl = tbl;
 		status = AcpiWalkResources(src_handle, METHOD_NAME__CRS,
 				get_irq_resource, &ires);
 		if (ACPI_FAILURE(status)) {