From bb0fb4c0f40803eaffd7a4fc0ec3a9fe4a8be0f0 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Wed, 6 May 2020 08:02:40 -0400
Subject: rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD

Have this symbol follow the pattern of all other such symbols.
This patch also removes a TODO from the code.

Reviewed-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 drivers/ata/mvsata_ide.c | 2 +-
 drivers/ata/sata_mv.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/ata')

diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 9ac16555d6c..6bbb345f6ef 100644
--- a/drivers/ata/mvsata_ide.c
+++ b/drivers/ata/mvsata_ide.c
@@ -10,7 +10,7 @@
 
 #if defined(CONFIG_ARCH_ORION5X)
 #include <asm/arch/orion5x.h>
-#elif defined(CONFIG_KIRKWOOD)
+#elif defined(CONFIG_ARCH_KIRKWOOD)
 #include <asm/arch/soc.h>
 #elif defined(CONFIG_ARCH_MVEBU)
 #include <linux/mbus.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 6019ac089e8..9ced9c0fa87 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -46,7 +46,7 @@
 #include <linux/mbus.h>
 
 #include <asm/arch/soc.h>
-#if defined(CONFIG_KIRKWOOD)
+#if defined(CONFIG_ARCH_KIRKWOOD)
 #define SATAHC_BASE		KW_SATA_BASE
 #else
 #define SATAHC_BASE		MVEBU_AXP_SATA_BASE
-- 
cgit v1.3.1