diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /include/linux/acpi.h | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 22a3f3779..f2f655150 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -174,6 +174,8 @@ extern inline void acpi_dev_idle(struct acpi_dev *dev) } } +extern int acpi_active; + #else /* CONFIG_ACPI */ extern inline struct acpi_dev* @@ -236,12 +238,6 @@ extern void (*acpi_power_off)(void); #define ACPI_TMR_TICKS_TO_uS(ticks) \ (((ticks) * 100) / (ACPI_TMR_HZ / 10000)) -/* CPU cycles -> PM timer cycles, looks somewhat heuristic but - (ticks = 3/11 * CPU_MHz + 2) comes pretty close for my systems - */ -#define ACPI_CPU_TO_TMR_TICKS(cycles) \ - ((cycles) / (3 * (loops_per_sec + 2500) / 500000 / 11 + 2)) - /* PM2_CNT flags */ #define ACPI_ARB_DIS 0x01 |