diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:24 -0400 |
| commit | f384c954c9fe3d3c6fce5ae66b67f2ddd947d098 (patch) | |
| tree | a38541b8083a2304435e9a153d408bd7cd44116e /drivers/acpi/acpica/acconfig.h | |
| parent | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (diff) | |
| parent | 5904b3b81d25166e5e39b9727645bb47937618e3 (diff) | |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/acpi/acpica/acconfig.h')
| -rw-r--r-- | drivers/acpi/acpica/acconfig.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h index 33181ad350d5..b17d8de9f6ff 100644 --- a/drivers/acpi/acpica/acconfig.h +++ b/drivers/acpi/acpica/acconfig.h | |||
| @@ -119,6 +119,10 @@ | |||
| 119 | 119 | ||
| 120 | #define ACPI_MAX_LOOP_ITERATIONS 0xFFFF | 120 | #define ACPI_MAX_LOOP_ITERATIONS 0xFFFF |
| 121 | 121 | ||
| 122 | /* Maximum sleep allowed via Sleep() operator */ | ||
| 123 | |||
| 124 | #define ACPI_MAX_SLEEP 20000 /* Two seconds */ | ||
| 125 | |||
| 122 | /****************************************************************************** | 126 | /****************************************************************************** |
| 123 | * | 127 | * |
| 124 | * ACPI Specification constants (Do not change unless the specification changes) | 128 | * ACPI Specification constants (Do not change unless the specification changes) |