diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-15 22:19:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-15 22:19:15 +0000 |
| commit | b15e61556ee6cb83b6558e98b1166d88949a6a11 (patch) | |
| tree | d3de24aece44c86100e432afb581fc5b4efa349e /sys/arch/i386 | |
| parent | dd4992934104c50c9952b5b76f65b9fb82a9ca8d (diff) | |
remove the #ifdef ACPI_ENABLE. the EC codepath is either safe enough (and
will be improved), or it is unsafe because AML assumes it must be there
ok almost everyone
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index 3b3e6e9af4c..00de6b15445 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.6 2007/05/29 08:22:14 gwk Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.7 2007/11/15 22:19:13 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -115,9 +115,9 @@ acpi_probe(struct device *parent, struct cfdata *match, struct acpi_attach_args paddr_t ebda; #if NAPM > 0 extern int apm_attached; - + if (apm_attached) - return (0); + return (0); #endif #if NBIOS > 0 { @@ -170,8 +170,6 @@ havebase: void acpi_attach_machdep(struct acpi_softc *sc) { -#ifdef ACPI_ENABLE sc->sc_interrupt = isa_intr_establish(NULL, sc->sc_fadt->sci_int, IST_LEVEL, IPL_TTY, acpi_interrupt, sc, "acpi"); -#endif } |