Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/30387: Nicolas Joly: -current i386 GENERIC_LAPTOP kernel compilation failure

This commit is contained in:
christos 2005-05-31 17:51:49 +00:00
parent 71c7a235ad
commit 2514b28c3f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/i386/i386/apm.c
View File

@ -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 */

4
sys/arch/i386/include/apmvar.h
View File

@ -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

6
sys/arch/i386/pci/pci_addr_fixup.c
View File

@ -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" },