--- linux/arch/ia64/kernel/acpi.c.string	Sat Sep  9 17:30:07 2000
+++ linux/arch/ia64/kernel/acpi.c	Sat Sep  9 17:31:11 2000
@@ -233,7 +233,7 @@ acpi_parse(acpi_rsdp_t *rsdp)
 
 	rsdp->rsdt = __va(rsdp->rsdt);
 	rsdt = rsdp->rsdt;
-	if (strncmp(rsdt->header.signature, ACPI_RSDT_SIG, ACPI_RSDT_SIG_LEN)) {
+	if (strncmp(rsdt->header.signature, ACPI_RSDT_SIG_STR, ACPI_RSDT_SIG_LEN)) {
 		printk("Uh-oh, ACPI RDST signature incorrect!\n");
 		return 0;
 	}
@@ -250,7 +250,7 @@ acpi_parse(acpi_rsdp_t *rsdp)
 		hdrp = (acpi_desc_table_hdr_t *) __va(rsdt->entry_ptrs[i]);
 
 		/* Only interested int the MSAPIC table for now ... */
-		if (strncmp(hdrp->signature, ACPI_SAPIC_SIG, ACPI_SAPIC_SIG_LEN) != 0)
+		if (strncmp(hdrp->signature, ACPI_SAPIC_SIG_STR, ACPI_SAPIC_SIG_LEN) != 0)
 			continue;
 
 		acpi_parse_msapic((acpi_sapic_t *) hdrp);
--- linux/include/asm-ia64/acpi-ext.h.string	Sat Sep  9 17:27:38 2000
+++ linux/include/asm-ia64/acpi-ext.h	Sat Sep  9 17:28:12 2000
@@ -12,7 +12,7 @@
 
 #include <linux/types.h>
 
-#define ACPI_RSDP_SIG "RSD PTR " /* Trailing space required */
+#define ACPI_RSDP_SIG_STR "RSD PTR " /* Trailing space required */
 #define ACPI_RSDP_SIG_LEN 8
 typedef struct {
 	char signature[8];
@@ -35,14 +35,14 @@ typedef struct {
 	char reserved[4];
 } acpi_desc_table_hdr_t;
 
-#define ACPI_RSDT_SIG "RSDT"
+#define ACPI_RSDT_SIG_STR "RSDT"
 #define ACPI_RSDT_SIG_LEN 4
 typedef struct acpi_rsdt {
 	acpi_desc_table_hdr_t header;
 	unsigned long entry_ptrs[1];	/* Not really . . . */
 } acpi_rsdt_t;
 
-#define ACPI_SAPIC_SIG "SPIC"
+#define ACPI_SAPIC_SIG_STR "SPIC"
 #define ACPI_SAPIC_SIG_LEN 4
 typedef struct {
 	acpi_desc_table_hdr_t header;