diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-03 18:33:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-03 18:33:15 -0800 |
| commit | d2bea739f8b41d620c235d81e00289d01169dc3c (patch) | |
| tree | 1a56f84a34a9642e19cc01caa34d343691f34f3e /drivers/clocksource/Makefile | |
| parent | 53528695ff6d8b77011bc818407c13e30914a946 (diff) | |
| parent | 4faefda97bc1be6ca909ba0fd0927ea78f37f67e (diff) | |
| download | lwn-d2bea739f8b41d620c235d81e00289d01169dc3c.tar.gz lwn-d2bea739f8b41d620c235d81e00289d01169dc3c.zip | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 apic changes from Ingo Molnar:
"The main changes in this cycle were:
- Numachip updates: new hardware support, fixes and cleanups.
(Daniel J Blueman)
- misc smaller cleanups and fixlets"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/io_apic: Make eoi_ioapic_pin() static
x86/irq: Drop unlikely before IS_ERR_OR_NULL
x86/x2apic: Make stub functions available even if !CONFIG_X86_LOCAL_APIC
x86/apic: Deinline various functions
x86/numachip: Fix timer build conflict
x86/numachip: Introduce Numachip2 timer mechanisms
x86/numachip: Add Numachip IPI optimisations
x86/numachip: Add Numachip2 APIC support
x86/numachip: Cleanup Numachip support
Diffstat (limited to 'drivers/clocksource/Makefile')
| -rw-r--r-- | drivers/clocksource/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index fc9348dc4f92..67bc996ca909 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -63,3 +63,4 @@ obj-$(CONFIG_H8300) += h8300_timer8.o obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o obj-$(CONFIG_H8300_TPU) += h8300_tpu.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +obj-$(CONFIG_X86_NUMACHIP) += numachip.o |