diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-24 16:06:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-24 16:06:02 -0800 |
| commit | 091704ef34f2e6aed8436877aeb434125b002c18 (patch) | |
| tree | a23ad9ba8af938d7452443fa1df4ab7477851d4c /include | |
| parent | 36fb0cbc2234708af0a2139aaf693528fbd80d2f (diff) | |
| parent | 6247834ee787a356751731dd83eeb71b7261c534 (diff) | |
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.4
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -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 8879c2c830ec..63e50a16ded3 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h @@ -64,7 +64,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040116 +#define ACPI_CA_VERSION 0x20040211 /* Maximum objects in the various object caches */ |