lkml.org 
[lkml]   [2010]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
DateThu, 11 Mar 2010 13:21:49 +1100
FromStephen Rothwell <>
Subjectlinux-next: build failure after merge of the pcmcia tree
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-03-11 03:25    [from the cache]
©2003-2010