linux-mips
[Top] [All Lists]

[PATCH 2/6] MIPS: PNX833x: use IS_ENABLED() macro

To: ralf@linux-mips.org
Subject: [PATCH 2/6] MIPS: PNX833x: use IS_ENABLED() macro
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 31 Jan 2012 18:19:04 +0100
Cc: linux-mips@linux-mips.org, Florian Fainelli <florian@openwrt.org>
In-reply-to: <1328030348-21967-1-git-send-email-florian@openwrt.org>
References: <1328030348-21967-1-git-send-email-florian@openwrt.org>
Sender: linux-mips-bounce@linux-mips.org
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 arch/mips/pnx833x/stb22x/board.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/pnx833x/stb22x/board.c b/arch/mips/pnx833x/stb22x/board.c
index 644eb7c..4b328ac 100644
--- a/arch/mips/pnx833x/stb22x/board.c
+++ b/arch/mips/pnx833x/stb22x/board.c
@@ -91,7 +91,7 @@ void __init pnx833x_board_setup(void)
        pnx833x_gpio_select_function_alt(32);
        pnx833x_gpio_select_function_alt(33);
 
-#if defined(CONFIG_MTD_NAND_PLATFORM) || 
defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_PLATFORM)
        /* Setup MIU for NAND access on CS0...
         *
         * (it seems that we must also configure CS1 for reliable operation,
@@ -117,7 +117,7 @@ void __init pnx833x_board_setup(void)
        pnx833x_gpio_select_output(5);
        pnx833x_gpio_write(1, 5);
 
-#elif defined(CONFIG_MTD_CFI) || defined(CONFIG_MTD_CFI_MODULE)
+#elif IS_ENABLED(CONFIG_MTD_CFI)
 
        /* Set up MIU for 16-bit NOR access on CS0 and CS1... */
 
-- 
1.7.5.4


<Prev in Thread] Current Thread [Next in Thread>