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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Mar 2011 14:44:58 +1100

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                    [email-masked]
http://www.canb.auug.org.au/~sfr/