From 2514b28c3fc83043b89f00db6af9939dfcab2c63 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 31 May 2005 17:51:49 +0000
Subject: [PATCH] PR/30387: Nicolas Joly: -current i386 GENERIC_LAPTOP kernel
 compilation failure

---
 sys/arch/i386/i386/apm.c           | 6 +++---
 sys/arch/i386/include/apmvar.h     | 4 ++--
 sys/arch/i386/pci/pci_addr_fixup.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 4d434a675263..19a69b9794db 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: apm.c,v 1.84 2004/08/30 15:05:17 drochner Exp $ */
+/*	$NetBSD: apm.c,v 1.85 2005/05/31 17:51:49 christos Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.84 2004/08/30 15:05:17 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.85 2005/05/31 17:51:49 christos Exp $");
 
 #include "apm.h"
 #if NAPM > 1
@@ -636,7 +636,7 @@ apm_event_handle(sc, regs)
 {
 	int error, retval;
 	struct bioscallregs nregs;
-	char *code;
+	const char *code;
 
 	retval = 1;		/* assume we are going to make progress */
 
diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h
index af633f438322..eb807c80ec8b 100644
--- a/sys/arch/i386/include/apmvar.h
+++ b/sys/arch/i386/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmvar.h,v 1.19 2003/12/25 21:03:55 jmc Exp $	*/
+/*	$NetBSD: apmvar.h,v 1.20 2005/05/31 17:51:49 christos Exp $	*/
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,7 +66,7 @@ struct apm_connect_info {
 };
 
 struct apm_attach_args {
-	char *aaa_busname;
+	const char *aaa_busname;
 };
 
 #ifdef _KERNEL
diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c
index ca7465d19c53..af9f98c0deda 100644
--- a/sys/arch/i386/pci/pci_addr_fixup.c
+++ b/sys/arch/i386/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_addr_fixup.c,v 1.13 2004/04/11 06:00:26 kochi Exp $	*/
+/*	$NetBSD: pci_addr_fixup.c,v 1.14 2005/05/31 17:51:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000 UCHIYAMA Yasushi.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.13 2004/04/11 06:00:26 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_addr_fixup.c,v 1.14 2005/05/31 17:51:49 christos Exp $");
 
 #include "opt_pcibios.h"
 
@@ -84,7 +84,7 @@ pci_addr_fixup(pci_chipset_tag_t pc, int maxbus)
 	const struct {
 		bus_addr_t start;
 		bus_size_t size;
-		char *name;
+		const char *name;
 	} system_reserve [] = {
 		{ 0xfec00000, 0x100000, "I/O APIC" },
 		{ 0xfee00000, 0x100000, "Local APIC" },