diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /drivers/char | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/char')
| -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 |