diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:15:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:15:49 +0100 |
| commit | af37501c792107c2bde1524bdae38d9a247b841a (patch) | |
| tree | b50ee90d29e72956b8b7d8d19677fe5996755d49 /drivers/watchdog/Makefile | |
| parent | d859e29fe34cb833071b20aef860ee94fbad9bb2 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/pda.h
We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.
Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/watchdog/Makefile')
| -rw-r--r-- | drivers/watchdog/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index c19b866f5ed..806b3eb0853 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -111,9 +111,11 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o # PARISC Architecture # POWERPC Architecture +obj-$(CONFIG_GEF_WDT) += gef_wdt.o obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o +obj-$(CONFIG_PIKA_WDT) += pika_wdt.o obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o # PPC64 Architecture |