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/edac | |
| 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/edac')
| -rw-r--r-- | drivers/edac/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index e443f2c1dfd1..923d2e82a289 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig | |||
| @@ -349,21 +349,21 @@ config EDAC_OCTEON_PC | |||
| 349 | 349 | ||
| 350 | config EDAC_OCTEON_L2C | 350 | config EDAC_OCTEON_L2C |
| 351 | tristate "Cavium Octeon Secondary Caches (L2C)" | 351 | tristate "Cavium Octeon Secondary Caches (L2C)" |
| 352 | depends on EDAC_MM_EDAC && CPU_CAVIUM_OCTEON | 352 | depends on EDAC_MM_EDAC && CAVIUM_OCTEON_SOC |
| 353 | help | 353 | help |
| 354 | Support for error detection and correction on the | 354 | Support for error detection and correction on the |
| 355 | Cavium Octeon family of SOCs. | 355 | Cavium Octeon family of SOCs. |
| 356 | 356 | ||
| 357 | config EDAC_OCTEON_LMC | 357 | config EDAC_OCTEON_LMC |
| 358 | tristate "Cavium Octeon DRAM Memory Controller (LMC)" | 358 | tristate "Cavium Octeon DRAM Memory Controller (LMC)" |
| 359 | depends on EDAC_MM_EDAC && CPU_CAVIUM_OCTEON | 359 | depends on EDAC_MM_EDAC && CAVIUM_OCTEON_SOC |
| 360 | help | 360 | help |
| 361 | Support for error detection and correction on the | 361 | Support for error detection and correction on the |
| 362 | Cavium Octeon family of SOCs. | 362 | Cavium Octeon family of SOCs. |
| 363 | 363 | ||
| 364 | config EDAC_OCTEON_PCI | 364 | config EDAC_OCTEON_PCI |
| 365 | tristate "Cavium Octeon PCI Controller" | 365 | tristate "Cavium Octeon PCI Controller" |
| 366 | depends on EDAC_MM_EDAC && PCI && CPU_CAVIUM_OCTEON | 366 | depends on EDAC_MM_EDAC && PCI && CAVIUM_OCTEON_SOC |
| 367 | help | 367 | help |
| 368 | Support for error detection and correction on the | 368 | Support for error detection and correction on the |
| 369 | Cavium Octeon family of SOCs. | 369 | Cavium Octeon family of SOCs. |