diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 01:00:49 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 19:58:35 (GMT) |
| commit | 47d2261a3fa71cde24263559a4219a25e50d8c89 (patch) | |
| tree | 28774d5b330ccf1b777a3af222d8356918328013 /drivers/watchdog/Kconfig | |
| parent | fb7f27080adc65cd5f341bdf56a1d0c14f316c1b (diff) | |
| parent | 5fb9d37f27351e42f002e372074249f92cbdf815 (diff) | |
| download | linux-fsl-qoriq-47d2261a3fa71cde24263559a4219a25e50d8c89.tar.xz | |
Merge branch 'merge' into sdk-v1.6.x
This reverts v3.13-rc3+ (78fd82238d0e5716) to v3.12, except for
commits which I noticed which appear relevant to the SDK.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
arch/powerpc/include/asm/kvm_host.h
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/book3s_interrupts.S
arch/powerpc/kvm/e500.c
arch/powerpc/kvm/e500mc.c
arch/powerpc/sysdev/fsl_soc.h
drivers/Kconfig
drivers/cpufreq/ppc-corenet-cpufreq.c
drivers/dma/fsldma.c
drivers/dma/s3c24xx-dma.c
drivers/misc/Makefile
drivers/mmc/host/sdhci-of-esdhc.c
drivers/mtd/devices/m25p80.c
drivers/net/ethernet/freescale/gianfar.h
drivers/platform/Kconfig
drivers/platform/Makefile
drivers/spi/spi-fsl-espi.c
include/crypto/algapi.h
include/linux/netdev_features.h
include/linux/skbuff.h
include/net/ip.h
net/core/ethtool.c
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9a9de54..b27b75d 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -392,25 +392,6 @@ config RETU_WATCHDOG To compile this driver as a module, choose M here: the module will be called retu_wdt. -config MOXART_WDT - tristate "MOXART watchdog" - depends on ARCH_MOXART - help - Say Y here to include Watchdog timer support for the watchdog - existing on the MOXA ART SoC series platforms. - - To compile this driver as a module, choose M here: the - module will be called moxart_wdt. - -config SIRFSOC_WATCHDOG - tristate "SiRFSOC watchdog" - depends on ARCH_SIRF - select WATCHDOG_CORE - default y - help - Support for CSR SiRFprimaII and SiRFatlasVI watchdog. When - the watchdog triggers the system will be reset. - # AVR32 Architecture config AT32AP700X_WDT @@ -437,6 +418,8 @@ config BFIN_WDT # FRV Architecture +# H8300 Architecture + # X86 (i386 + ia64 + x86_64) Architecture config ACQUIRE_WDT @@ -885,7 +868,6 @@ config VIA_WDT config W83627HF_WDT tristate "W83627HF/W83627DHG Watchdog Timer" depends on X86 - select WATCHDOG_CORE ---help--- This is the driver for the hardware watchdog on the W83627HF chipset as used in Advantech PC-9578 and Tyan S2721-533 motherboards @@ -1145,13 +1127,6 @@ config LANTIQ_WDT help Hardware driver for the Lantiq SoC Watchdog Timer. -config RALINK_WDT - tristate "Ralink SoC watchdog" - select WATCHDOG_CORE - depends on RALINK - help - Hardware driver for the Ralink SoC Watchdog Timer. - # PARISC Architecture # POWERPC Architecture |