diff options
author | David Daney <david.daney@cavium.com> | 2013-05-22 11:10:46 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-10 12:01:25 -0400 |
commit | 9ddebc46e70b434e485060f7c1b53c5b848a6c8c (patch) | |
tree | 3a0c3c6d29b223390cccac888a4411a4fa217ab1 /drivers/watchdog/Kconfig | |
parent | 6e7582bf35b8a5a330fd08b398ae445bac86917a (diff) |
MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC
CAVIUM_OCTEON_SOC most place we used to use CPU_CAVIUM_OCTEON. This
allows us to CPU_CAVIUM_OCTEON in places where we have no OCTEON SOC.
Remove CAVIUM_OCTEON_SIMULATOR as it doesn't really do anything, we can
get the same configuration with CAVIUM_OCTEON_SOC.
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: linux-ide@vger.kernel.org
Cc: linux-edac@vger.kernel.org
Cc: linux-i2c@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: spi-devel-general@lists.sourceforge.net
Cc: devel@driverdev.osuosl.org
Cc: linux-usb@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Patchwork: https://patchwork.linux-mips.org/patch/5295/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index e89fc3133972..9d03af1c596f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -1072,7 +1072,7 @@ config TXX9_WDT | |||
1072 | 1072 | ||
1073 | config OCTEON_WDT | 1073 | config OCTEON_WDT |
1074 | tristate "Cavium OCTEON SOC family Watchdog Timer" | 1074 | tristate "Cavium OCTEON SOC family Watchdog Timer" |
1075 | depends on CPU_CAVIUM_OCTEON | 1075 | depends on CAVIUM_OCTEON_SOC |
1076 | default y | 1076 | default y |
1077 | select EXPORT_UASM if OCTEON_WDT = m | 1077 | select EXPORT_UASM if OCTEON_WDT = m |
1078 | help | 1078 | help |