This patch replaces the traditionnal use of: CONFIG_FOO || CONFIG_FOO_MODULE by IS_ENABLED(CONFIG_FOO) Florian Fainelli (6): MIPS: Alchemy: use IS_ENABLED() macro MIPS: PNX833x: use IS_ENABLED() macro MIPS: TXX9: use IS_ENABLED() macro MIPS: TX49XX: use IS_ENABLED() MIPS: DEC: use IS_ENABLED() MIPS: loongson: use IS_ENABLED() arch/mips/alchemy/board-mtx1.c | 4 ++-- arch/mips/alchemy/devboards/pb1100.c | 4 ++-- arch/mips/alchemy/devboards/pb1500.c | 4 ++-- arch/mips/dec/prom/memory.c | 2 +- arch/mips/include/asm/mach-loongson/loongson.h | 3 ++- arch/mips/include/asm/mach-tx49xx/mangle-port.h | 2 +- arch/mips/pnx833x/stb22x/board.c | 4 ++-- arch/mips/txx9/generic/setup.c | 12 +++++------- arch/mips/txx9/generic/setup_tx4939.c | 2 +- arch/mips/txx9/rbtx4939/setup.c | 11 +++++------ 10 files changed, 23 insertions(+), 25 deletions(-) -- 1.7.5.4