diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
| commit | c8ebfc888f9ee93f2dc7cd62b3be66263755d99a (patch) | |
| tree | f449a3433c022ed8fd9aaa8f291a1b4e354fd5b9 /include/linux/acpi.h | |
| parent | 5d12a58c4049a4839abbbdf87dd189505513b1b6 (diff) | |
v2.4.1.2 -> v2.4.1.3
- Jens: better ordering of requests when unable to merge
- Neil Brown: make md work as a module again (we cannot autodetect
in modules, not enough background information)
- Neil Brown: raid5 SMP locking cleanups
- Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
dentry leak fix
- maestro3 shutdown fix
- fix dcache hash calculation that could cause bad hashes under certain
circumstances (Dean Gaudet)
- David Miller: networking and sparc updates
- Jeff Garzik: include file cleanups
- Andy Grover: ACPI update
- Coda-fs error return fixes
- rth: alpha Jensen update
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4fce3f847249..f5bfb4eacc32 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -82,13 +82,11 @@ typedef int acpi_dstate_t; /* PM_TMR masks */ #define ACPI_TMR_VAL_EXT 0x00000100 #define ACPI_TMR_MASK 0x00ffffff -#define ACPI_TMR_HZ 3580000 /* 3.58 MHz */ +#define ACPI_TMR_HZ 3579545 /* 3.58 MHz */ +#define ACPI_TMR_KHZ (ACPI_TMR_HZ / 1000) -/* strangess to avoid integer overflow */ #define ACPI_MICROSEC_TO_TMR_TICKS(val) \ - (((val) * (ACPI_TMR_HZ / 10000)) / 100) -#define ACPI_TMR_TICKS_TO_MICROSEC(ticks) \ - (((ticks) * 100) / (ACPI_TMR_HZ / 10000)) + (((val) * (ACPI_TMR_KHZ)) / 1000) /* PM2_CNT flags */ #define ACPI_ARB_DIS 0x01 @@ -147,6 +145,9 @@ enum ACPI_C1_TIME, ACPI_C2_TIME, ACPI_C3_TIME, + ACPI_C1_COUNT, + ACPI_C2_COUNT, + ACPI_C3_COUNT, ACPI_S0_SLP_TYP, ACPI_S1_SLP_TYP, ACPI_S5_SLP_TYP, |