diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /drivers/misc/hpilo.h | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'drivers/misc/hpilo.h')
| -rw-r--r-- | drivers/misc/hpilo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h index a281207696c1..b64a20ef07e3 100644 --- a/drivers/misc/hpilo.h +++ b/drivers/misc/hpilo.h | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | #define MAX_ILO_DEV 1 | 19 | #define MAX_ILO_DEV 1 |
| 20 | /* max number of files */ | 20 | /* max number of files */ |
| 21 | #define MAX_OPEN (MAX_CCB * MAX_ILO_DEV) | 21 | #define MAX_OPEN (MAX_CCB * MAX_ILO_DEV) |
| 22 | /* spin counter for open/close delay */ | ||
| 23 | #define MAX_WAIT 10000 | ||
| 22 | 24 | ||
| 23 | /* | 25 | /* |
| 24 | * Per device, used to track global memory allocations. | 26 | * Per device, used to track global memory allocations. |