aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Makefile
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/Makefile
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/Makefile')
-rw-r--r--drivers/watchdog/Makefile17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 8374503fcc6a..ed26f7094e47 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -4,7 +4,7 @@
4 4
5# Only one watchdog can succeed. We probe the ISA/PCI/USB based 5# Only one watchdog can succeed. We probe the ISA/PCI/USB based
6# watchdog-cards first, then the architecture specific watchdog 6# watchdog-cards first, then the architecture specific watchdog
7# drivers and then the architecture independant "softdog" driver. 7# drivers and then the architecture independent "softdog" driver.
8# This means that if your ISA/PCI/USB card isn't detected that 8# This means that if your ISA/PCI/USB card isn't detected that
9# you can fall back to an architecture specific driver and if 9# you can fall back to an architecture specific driver and if
10# that also fails then you can fall back to the software watchdog 10# that also fails then you can fall back to the software watchdog
@@ -68,6 +68,7 @@ obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
68obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o 68obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
69obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o 69obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
70obj-$(CONFIG_F71808E_WDT) += f71808e_wdt.o 70obj-$(CONFIG_F71808E_WDT) += f71808e_wdt.o
71obj-$(CONFIG_SP5100_TCO) += sp5100_tco.o
71obj-$(CONFIG_GEODE_WDT) += geodewdt.o 72obj-$(CONFIG_GEODE_WDT) += geodewdt.o
72obj-$(CONFIG_SC520_WDT) += sc520_wdt.o 73obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
73obj-$(CONFIG_SBC_FITPC2_WATCHDOG) += sbc_fitpc2_wdt.o 74obj-$(CONFIG_SBC_FITPC2_WATCHDOG) += sbc_fitpc2_wdt.o
@@ -86,6 +87,7 @@ obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
86obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o 87obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
87obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o 88obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
88obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o 89obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
90obj-$(CONFIG_NV_TCO) += nv_tco.o
89obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o 91obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
90obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o 92obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
91obj-$(CONFIG_SBC8360_WDT) += sbc8360.o 93obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
@@ -100,17 +102,20 @@ obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
100obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o 102obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
101obj-$(CONFIG_MACHZ_WDT) += machzwd.o 103obj-$(CONFIG_MACHZ_WDT) += machzwd.o
102obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o 104obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
105obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
103 106
104# M32R Architecture 107# M32R Architecture
105 108
106# M68K Architecture 109# M68K Architecture
107 110obj-$(CONFIG_M54xx_WATCHDOG) += m54xx_wdt.o
108# M68KNOMMU Architecture
109 111
110# MIPS Architecture 112# MIPS Architecture
113obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o
111obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o 114obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o
115obj-$(CONFIG_BCM63XX_WDT) += bcm63xx_wdt.o
112obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o 116obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
113obj-$(CONFIG_INDYDOG) += indydog.o 117obj-$(CONFIG_INDYDOG) += indydog.o
118obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
114obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o 119obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
115obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o 120obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
116obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o 121obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
@@ -118,6 +123,7 @@ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
118obj-$(CONFIG_TXX9_WDT) += txx9wdt.o 123obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
119obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o 124obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
120octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o 125octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
126obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
121 127
122# PARISC Architecture 128# PARISC Architecture
123 129
@@ -145,7 +151,10 @@ obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o
145 151
146# XTENSA Architecture 152# XTENSA Architecture
147 153
148# Architecture Independant 154# Xen
155obj-$(CONFIG_XEN_WDT) += xen_wdt.o
156
157# Architecture Independent
149obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o 158obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o
150obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o 159obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
151obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o 160obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o