diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:14:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:14:38 -0400 |
| commit | c80dc60b03d633047c7f96be87fd59cdcdbb929f (patch) | |
| tree | 1ef931c2287e376f8fef37cea89f7a951d9d3b00 /include/acpi/acconfig.h | |
| parent | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab (diff) | |
| parent | 0466684907ea1695eeef98cb28ca3399882ecc0a (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: ACPI_DOCK: Initialize the atomic notifier list
ACPI: acpi_os_allocate() fixes
ACPI: SBS: fix initialization, sem2mutex
ACPI: add 'const' to several ACPI file_operations
ACPI: delete some defaults from ACPI Kconfig
ACPI: "Device `[%s]' is not power manageable" make message debug only
ACPI: ACPI_DOCK Kconfig
Revert "Revert "ACPI: dock driver""
ACPI: acpi_os_get_thread_id() returns current
ACPI: ACPICA 20060707
Diffstat (limited to 'include/acpi/acconfig.h')
| -rw-r--r-- | include/acpi/acconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index b492857fe721..9e6c23c360b2 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | 63 | ||
| 64 | /* Current ACPICA subsystem version in YYYYMMDD format */ | 64 | /* Current ACPICA subsystem version in YYYYMMDD format */ |
| 65 | 65 | ||
| 66 | #define ACPI_CA_VERSION 0x20060623 | 66 | #define ACPI_CA_VERSION 0x20060707 |
| 67 | 67 | ||
| 68 | /* | 68 | /* |
| 69 | * OS name, used for the _OS object. The _OS object is essentially obsolete, | 69 | * OS name, used for the _OS object. The _OS object is essentially obsolete, |