summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc85xx/b4860_ids.c
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-11-18 11:56:57 -0800
committerYork Sun <york.sun@nxp.com>2016-11-23 23:42:12 -0800
commitb41f192b6763948f878e1948770c7305211a2348 (patch)
tree6db6a872deb63dd33bd5822725e75887a66beb08 /arch/powerpc/cpu/mpc85xx/b4860_ids.c
parentd46a4a137898d17c736d13bbe405b479aeb4483a (diff)
downloadu-boot-b41f192b6763948f878e1948770c7305211a2348.tar.gz
powerpc: B4420: Remove macro CONFIG_PPC_B4420
Replace CONFIG_PPC_B4420 with ARCH_B4420 in Kconfig and clean up existing macros.
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/b4860_ids.c')
-rw-r--r--arch/powerpc/cpu/mpc85xx/b4860_ids.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
index 85eba0b22d..4ceb6f51f3 100644
--- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c
@@ -62,7 +62,7 @@ struct liodn_id_table liodn_tbl[] = {
SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
-#ifndef CONFIG_PPC_B4420
+#ifndef CONFIG_ARCH_B4420
SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
SET_GUTS_LIODN(NULL, 201, rio1maintliodnr, 0),
@@ -81,7 +81,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
SET_FMAN_RX_1G_LIODN(1, 3, 91),
SET_FMAN_RX_1G_LIODN(1, 4, 92),
SET_FMAN_RX_1G_LIODN(1, 5, 93),
-#ifndef CONFIG_PPC_B4420
+#ifndef CONFIG_ARCH_B4420
SET_FMAN_RX_10G_LIODN(1, 0, 94),
SET_FMAN_RX_10G_LIODN(1, 1, 95),
#endif