diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2008-06-01 17:59:56 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2008-06-01 17:59:56 +0000 |
| commit | cbc33fb1757f353b753efe6c3cccbfaafd77470f (patch) | |
| tree | aeb2d3bad30ad0996583a2bc82639b90c65fa644 /sys/arch | |
| parent | 5ffc77f9703592edda7da769bf3bf4d8797c5351 (diff) | |
Re-enable new parser. Lots of testing by various folks. Fits all media
now too.
ok kettenis deraadt
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index 26d7911692a..cbb2cc83437 100644 --- a/sys/arch/amd64/amd64/acpi_machdep.c +++ b/sys/arch/amd64/amd64/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.12 2008/02/05 22:00:54 marco Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.13 2008/06/01 17:59:55 marco Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -149,6 +149,7 @@ havebase: return (1); } +#ifndef SMALL_KERNEL void acpi_attach_machdep(struct acpi_softc *sc) { @@ -158,3 +159,4 @@ acpi_attach_machdep(struct acpi_softc *sc) IST_LEVEL, IPL_TTY, acpi_interrupt, sc, sc->sc_dev.dv_xname); cpuresetfn = acpi_reset; } +#endif /* SMALL_KERNEL */ diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index 615c5739b0d..b2159967be9 100644 --- a/sys/arch/i386/i386/acpi_machdep.c +++ b/sys/arch/i386/i386/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.12 2008/02/05 22:00:54 marco Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.13 2008/06/01 17:59:55 marco Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -169,6 +169,7 @@ havebase: return (1); } +#ifndef SMALL_KERNEL void acpi_attach_machdep(struct acpi_softc *sc) { @@ -182,3 +183,4 @@ acpi_attach_machdep(struct acpi_softc *sc) acpiapm_kqfilter = acpikqfilter; cpuresetfn = acpi_reset; } +#endif /* SMALL_KERNEL */ |