diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/acpi/acparser.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/acpi/acparser.h')
| -rw-r--r-- | include/acpi/acparser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acparser.h b/include/acpi/acparser.h index 5a1ff484af33..9d49d3c41cd9 100644 --- a/include/acpi/acparser.h +++ b/include/acpi/acparser.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #define OP_HAS_RETURN_VALUE 1 | 47 | #define OP_HAS_RETURN_VALUE 1 |
| 48 | 48 | ||
| 49 | /* variable # arguments */ | 49 | /* Variable number of arguments. This field must be 32 bits */ |
| 50 | 50 | ||
| 51 | #define ACPI_VAR_ARGS ACPI_UINT32_MAX | 51 | #define ACPI_VAR_ARGS ACPI_UINT32_MAX |
| 52 | 52 | ||
| @@ -71,7 +71,7 @@ | |||
| 71 | /* | 71 | /* |
| 72 | * psxface - Parser external interfaces | 72 | * psxface - Parser external interfaces |
| 73 | */ | 73 | */ |
| 74 | acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info); | 74 | acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info); |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | * psargs - Parse AML opcode arguments | 77 | * psargs - Parse AML opcode arguments |