As suggested by Geert Uytterhoeven http://kisskb.ellerman.id.au/kisskb/buildresult/7280352/ arch/m68k/include/asm/hardirq.h:23:20: error: expected ')' before 'DRIVER_NAME' make[4]: *** [drivers/memstick/core/ms_block.o] Error 1 The reason for this is that pr_fmt() references DRIVER_NAME and is defined before the first include, while DRIVER_NAME is only defined in ms_block.h, which is the last included file. If any subsequent include file uses pr_fmt() (e.g. the call to pr_crit() in arch/m68k/include/asm/hardirq.h), this causes a build failure. I suggest moving the DRIVER_NAME define to ms_block.c. Cfr. memstick.c and mspro_block.c, who already have their own definition. CC: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx> --- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/core/ms_block.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index c815fe5..71e5937 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -11,7 +11,7 @@ * Copyright (C) 2007 Alex Dubov <oakad@xxxxxxxxx> * */ - +#define DRIVER_NAME "ms_block" #define pr_fmt(fmt) DRIVER_NAME ": " fmt #include <linux/module.h> diff --git a/drivers/memstick/core/ms_block.h b/drivers/memstick/core/ms_block.h index a2b2765..546b55e 100644 --- a/drivers/memstick/core/ms_block.h +++ b/drivers/memstick/core/ms_block.h @@ -277,8 +277,6 @@ static int msb_reset(struct msb_data *msb, bool full); static int h_msb_default_bad(struct memstick_dev *card, struct memstick_request **mrq); -#define DRIVER_NAME "ms_block" - #define __dbg(level, format, ...) \ do { \ if (debug >= level) \ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
