The patch titled prevent SSB compilation on s390 has been added to the -mm tree. Its filename is prevent-ssb-compilation-on-s390-part-2.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: prevent SSB compilation on s390 From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> drivers/ssb/Kconfig has already a depends on HAS_IOMEM which should prevent SSB from being selected. But appearantly it looks like this doesn't matter at all if it gets selected from somewhere else. So add an explicit depends on HAS_IOMEM to the Broadcom driver to prevent selection on s390. Cc: "John W. Linville" <linville@xxxxxxxxxxxxx> Cc: Michael Buesch <mb@xxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/Kconfig | 1 + 1 files changed, 1 insertion(+) diff -puN drivers/net/Kconfig~prevent-ssb-compilation-on-s390-part-2 drivers/net/Kconfig --- a/drivers/net/Kconfig~prevent-ssb-compilation-on-s390-part-2 +++ a/drivers/net/Kconfig @@ -1434,6 +1434,7 @@ config APRICOT config B44 tristate "Broadcom 440x/47xx ethernet support" + depends on HAS_IOMEM select SSB select MII help _ Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are origin.patch fix-warn_on-on-bitfield-ops-for-all-other-archs.patch git-wireless.patch avoid-ssb-compililation-on-s390.patch prevent-ssb-compilation-on-s390-part-2.patch during-vm-oom-condition-kill-all-threads-in-process-group.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html