]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
memstick: ms_block: fix compile issue
authorMaxim Levitsky <maximlevitsky@gmail.com>
Fri, 12 Oct 2012 04:22:42 +0000 (15:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 03:43:36 +0000 (14:43 +1100)
commit5c46f5fe51d4a3a649ab67ca7c70a5e517fb4333
tree944501c5f1f1edbf334ad10efa5a76a055824b6b
parent9d89be3f23c391e1e1eb120997aa94758779f2f8
memstick: ms_block: fix compile issue

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.

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/memstick/core/ms_block.c
drivers/memstick/core/ms_block.h