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

[Stephen Rothwell]

Hi Dominik,

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

drivers/pcmcia/pcmcia_resource.c:704:1: error: unterminated #ifdef

Caused by commit 484f4b3fdd8f3de102b07a9b6d0d72342bcc1590 ("pcmcia:
revert "irq probe can be done without risking an IRQ storm"") which has
conflict resolution fragments still in it ...

Please, please, read and build test this stuff ...

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

Attachment: pgp00000.pgp
Description: PGP signature