diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-06 22:34:21 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-06 22:34:21 +0100 |
| commit | 25da0974601fc8096461f3d3f7ca3aab8e79adfb (patch) | |
| tree | f9b3c1bfbc63fdb6a94e82177b8c3ae891125422 /drivers/char/hangcheck-timer.c | |
| parent | [ACPI] linux-acpi@vger.kernel.org replaces acpi-devel@lists.sourceforge.net (diff) | |
| parent | Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
| download | linux-25da0974601fc8096461f3d3f7ca3aab8e79adfb.tar.xz linux-25da0974601fc8096461f3d3f7ca3aab8e79adfb.zip | |
Auto-update from upstream
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 66e53dd450ff..40a67c86420c 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) |