diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/char/mmtimer.c | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/mmtimer.c')
| -rw-r--r-- | drivers/char/mmtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index c92378121b4c..1b05fa688996 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c | |||
| @@ -675,7 +675,7 @@ static int __init mmtimer_init(void) | |||
| 675 | cnodeid_t node, maxn = -1; | 675 | cnodeid_t node, maxn = -1; |
| 676 | 676 | ||
| 677 | if (!ia64_platform_is("sn2")) | 677 | if (!ia64_platform_is("sn2")) |
| 678 | return -1; | 678 | return 0; |
| 679 | 679 | ||
| 680 | /* | 680 | /* |
| 681 | * Sanity check the cycles/sec variable | 681 | * Sanity check the cycles/sec variable |