diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
| commit | ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 (patch) | |
| tree | a7c0d18d6486734dffb9498e30db5b226b6e23bf /drivers/char/mmtimer.c | |
| parent | c2956a3b0d1c17b38da369811a6ce93eb7a01a04 (diff) | |
| parent | 75deb6fa985bd3162b9472f1fc394e23294da816 (diff) | |
Merge branch 'upstream'
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 |