diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 12:59:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 12:59:59 -0800 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /drivers/char/hangcheck-timer.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/char/hangcheck-timer.c')
| -rw-r--r-- | drivers/char/hangcheck-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c index 66e53dd450f..40a67c86420 100644 --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c @@ -120,7 +120,7 @@ __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks); #if defined(CONFIG_X86) # define HAVE_MONOTONIC # define TIMER_FREQ 1000000000ULL -#elif defined(CONFIG_ARCH_S390) +#elif defined(CONFIG_S390) /* FA240000 is 1 Second in the IBM time universe (Page 4-38 Principles of Op for zSeries */ # define TIMER_FREQ 0xFA240000ULL #elif defined(CONFIG_IA64) |