diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-09-29 18:29:44 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-09-29 18:29:44 +0000 |
commit | e266621a9f87cf71c1bc1385b1ed020a5c62e442 (patch) | |
tree | 7a2c123636fbc6f6b958519cd857db4d0fd33482 /sys/dev/acpi/dsdt.h | |
parent | b9d8e403b6c81a1ff272ceeb8d62bc58f9ff5f61 (diff) |
back out previous commit, since it is breaking a variety of machines
(Supermicro X5DLR, and seperately, see pr 5941)
Diffstat (limited to 'sys/dev/acpi/dsdt.h')
-rw-r--r-- | sys/dev/acpi/dsdt.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/acpi/dsdt.h b/sys/dev/acpi/dsdt.h index 42b24774226..e3e7cff3008 100644 --- a/sys/dev/acpi/dsdt.h +++ b/sys/dev/acpi/dsdt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.h,v 1.39 2008/09/25 19:12:28 jordan Exp $ */ +/* $OpenBSD: dsdt.h,v 1.40 2008/09/29 18:29:43 deraadt Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -48,6 +48,7 @@ struct aml_opcode { }; const char *aml_eisaid(u_int32_t); +const char *aml_args(int); const char *aml_mnem(int, uint8_t *); int64_t aml_val2int(struct aml_value *); struct aml_node *aml_searchname(struct aml_node *, const void *); @@ -89,7 +90,6 @@ int acpi_mutex_acquire(struct aml_value *, int); void acpi_mutex_release(struct aml_value *); const char *aml_nodename(struct aml_node *); -int aml_evalhid(struct aml_node *, struct aml_value *); #define SR_IRQ 0x04 #define SR_DMA 0x05 @@ -255,8 +255,6 @@ void aml_disasm(struct aml_scope *scope, int lvl, void *arg); int aml_xgetpci(struct aml_node *, int64_t *); -int acpi_walkmem(int, const char *); - #define aml_get8(p) *(uint8_t *)(p) #define aml_get16(p) *(uint16_t *)(p) #define aml_get32(p) *(uint32_t *)(p) |