MIPS: PNX833x: use IS_ENABLED() macro
authorFlorian Fainelli <florian@openwrt.org>
Tue, 31 Jan 2012 17:19:04 +0000 (18:19 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 23 Jul 2012 12:55:53 +0000 (13:55 +0100)
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3332/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/pnx833x/stb22x/board.c

index 644eb7c..4b328ac 100644 (file)
@@ -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... */