Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
arch/x86/include/asm/timer.h between commit
8e6dafd6c741cd4679b4de3c5d9698851e4fa59c ("x86: refactor x86_quirks
support") from the x86 tree and commit
199785eac892a1fa1b71cc22bec58e8b156d9311 ("[CPUFREQ] p4-clockmod reports
wrong frequency") from the cpufreq tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/include/asm/timer.h
index a81195e,4f5c247..0000000
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@@ -12,9 -11,8 +12,9 @@@ unsigned long native_calibrate_tsc(void
#ifdef CONFIG_X86_32
extern int timer_ack;
- extern int recalibrate_cpu_khz(void);
-#endif
+extern irqreturn_t timer_interrupt(int irq, void *dev_id);
+#endif /* CONFIG_X86_32 */
+ extern int recalibrate_cpu_khz(void);
extern int no_timer_check;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
