linux-next: build failure after merge of the final tree

From: Stephen Rothwell
Date: Sun Mar 27 2011 - 23:45:37 EST


Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol
arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here

Caused by commit 926341250102 ("memstick: add driver for Ricoh R5C592
card reader").

enable_dma() is also defined in a few other architectures including x86
(presumably asm/dma.h does not get included there).

I just reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature