linux-next: net/wireless tree build failure

[Stephen Rothwell]

Hi John, Dave,

Today's linux-next build (pmac32 defconfig) failed like this:

In file included from drivers/net/wireless/b43/phy_common.h:5,
                 from drivers/net/wireless/b43/phy_common.c:30:
include/linux/rfkill.h: In function 'rfkill_alloc':
include/linux/rfkill.h:279: error: implicit declaration of function 'ERR_PTR'
include/linux/rfkill.h:279: warning: return makes pointer from integer without a cast
include/linux/rfkill.h: In function 'rfkill_register':
include/linux/rfkill.h:284: warning: comparison between pointer and integer
In file included from include/linux/dma-mapping.h:6,
                 from arch/powerpc/include/asm/pci.h:16,
                 from include/linux/pci.h:1101,
                 from include/linux/ssb/ssb.h:9,
                 from drivers/net/wireless/b43/b43.h:9,
                 from drivers/net/wireless/b43/phy_common.c:35:
include/linux/err.h: At top level:
include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
include/linux/rfkill.h:279: note: previous implicit declaration of 'ERR_PTR' was here

Probably caused by commit 19d337dff95cbf76edd3ad95c0cee2732c3e1ec5
("rfkill: rewrite") which added uses of ERR_PTR to inlines in rfkill.h
but did not include linux/err.h.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature