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

[Stephen Rothwell]

Hi Chris,

After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/mmc/core/core.c:2141:1: error: redefinition of '__inittest'
drivers/mmc/core/core.c:125:1: note: previous definition of '__inittest' was here
drivers/mmc/core/core.c:2141:1: error: redefinition of 'init_module'
drivers/mmc/core/core.c:125:1: note: previous definition of 'init_module' was here

Seems to be caused by commit 65cae3d20446 ("mmc: core: add random fault
injection").

I have used the mmc tree from next-20110707 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature