Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/arch/ia64/kernel/acpi.c |   26 +++++++++++++-------------
 memhotplug-dave/include/linux/acpi.h    |   23 +++++++++++------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff -puN arch/ia64/kernel/acpi.c~ia64-acpi arch/ia64/kernel/acpi.c
--- memhotplug/arch/ia64/kernel/acpi.c~ia64-acpi	2005-04-11 15:49:49.000000000 -0700
+++ memhotplug-dave/arch/ia64/kernel/acpi.c	2005-04-11 15:49:49.000000000 -0700
@@ -72,6 +72,19 @@ u16 ia64_acpiid_to_sapicid[MAX_SAPICS] =
 	{ [0 ... MAX_SAPICS - 1] = -1 };
 EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
 
+unsigned long __init
+acpi_find_rsdp (void)
+{
+	unsigned long rsdp_phys = 0;
+
+	if (efi.acpi20)
+		rsdp_phys = __pa(efi.acpi20);
+	else if (efi.acpi)
+		printk(KERN_WARNING PREFIX "v1.0/r0.71 tables no longer supported\n");
+	return rsdp_phys;
+}
+
+
 const char *
 acpi_get_sysname (void)
 {
@@ -558,19 +571,6 @@ acpi_parse_fadt (unsigned long phys_addr
 }
 
 
-unsigned long __init
-acpi_find_rsdp (void)
-{
-	unsigned long rsdp_phys = 0;
-
-	if (efi.acpi20)
-		rsdp_phys = __pa(efi.acpi20);
-	else if (efi.acpi)
-		printk(KERN_WARNING PREFIX "v1.0/r0.71 tables no longer supported\n");
-	return rsdp_phys;
-}
-
-
 int __init
 acpi_boot_init (void)
 {
diff -puN include/linux/acpi.h~ia64-acpi include/linux/acpi.h
--- memhotplug/include/linux/acpi.h~ia64-acpi	2005-04-11 15:49:49.000000000 -0700
+++ memhotplug-dave/include/linux/acpi.h	2005-04-11 15:49:49.000000000 -0700
@@ -36,6 +36,17 @@
 #include <acpi/acpi_drivers.h>
 #include <asm/acpi.h>
 
+struct acpi20_table_rsdp {
+	char			signature[8];
+	u8			checksum;
+	char			oem_id[6];
+	u8			revision;
+	u32			rsdt_address;
+	u32			length;
+	u64			xsdt_address;
+	u8			ext_checksum;
+	u8			reserved[3];
+} __attribute__ ((packed));
 
 #ifdef CONFIG_ACPI_BOOT
 
@@ -59,18 +70,6 @@ struct acpi_table_rsdp {
 	u32			rsdt_address;
 } __attribute__ ((packed));
 
-struct acpi20_table_rsdp {
-	char			signature[8];
-	u8			checksum;
-	char			oem_id[6];
-	u8			revision;
-	u32			rsdt_address;
-	u32			length;
-	u64			xsdt_address;
-	u8			ext_checksum;
-	u8			reserved[3];
-} __attribute__ ((packed));
-
 typedef struct {
 	u8			type;
 	u8			length;
_