diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
| commit | 6e07e16404deafadf45895a7d2aeb5feba53b479 (patch) | |
| tree | a7025d6632f0b3eb6232eafba79f331ead812fcf /arch/x86_64/kernel/pmtimer.c | |
| parent | 08a556db919f67e1e4d33ae8d40f7222da34d994 (diff) | |
| parent | e8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/x86_64/kernel/pmtimer.c')
| -rw-r--r-- | arch/x86_64/kernel/pmtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/pmtimer.c b/arch/x86_64/kernel/pmtimer.c index ee5ee4891f3d..b0444a415bd6 100644 --- a/arch/x86_64/kernel/pmtimer.c +++ b/arch/x86_64/kernel/pmtimer.c | |||
| @@ -121,7 +121,7 @@ unsigned int do_gettimeoffset_pm(void) | |||
| 121 | static int __init nopmtimer_setup(char *s) | 121 | static int __init nopmtimer_setup(char *s) |
| 122 | { | 122 | { |
| 123 | pmtmr_ioport = 0; | 123 | pmtmr_ioport = 0; |
| 124 | return 0; | 124 | return 1; |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | __setup("nopmtimer", nopmtimer_setup); | 127 | __setup("nopmtimer", nopmtimer_setup); |