projects
/
linux-flexiantxendom0-natty.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' into for-linus
[linux-flexiantxendom0-natty.git]
/
arch
/
x86
/
kernel
/
vmiclock_32.c
diff --git
a/arch/x86/kernel/vmiclock_32.c
b/arch/x86/kernel/vmiclock_32.c
index
25bbb9b
..
5e1ff66
100644
(file)
--- a/
arch/x86/kernel/vmiclock_32.c
+++ b/
arch/x86/kernel/vmiclock_32.c
@@
-79,11
+79,7
@@
unsigned long vmi_tsc_khz(void)
static inline unsigned int vmi_get_timer_vector(void)
{
-#ifdef CONFIG_X86_IO_APIC
- return FIRST_DEVICE_VECTOR;
-#else
- return FIRST_EXTERNAL_VECTOR;
-#endif
+ return IRQ0_VECTOR;
}
/** vmi clockchip */