projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
time.c
diff --git
a/arch/x86_64/kernel/time.c
b/arch/x86_64/kernel/time.c
index
473b514
..
ef8bc46
100644
(file)
--- a/
arch/x86_64/kernel/time.c
+++ b/
arch/x86_64/kernel/time.c
@@
-1306,7
+1306,7
@@
irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static int __init nohpet_setup(char *s)
{
nohpet = 1;
- return
0
;
+ return
1
;
}
__setup("nohpet", nohpet_setup);
@@
-1314,7
+1314,7
@@
__setup("nohpet", nohpet_setup);
int __init notsc_setup(char *s)
{
notsc = 1;
- return
0
;
+ return
1
;
}
__setup("notsc", notsc_setup);