The patch titled m68k: windfarm is powerpc-only, don't do it on m68k macs has been added to the -mm tree. Its filename is m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: m68k: windfarm is powerpc-only, don't do it on m68k macs From: Al Viro <viro@xxxxxxxxxxxxxxxx> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx> Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/macintosh/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/macintosh/Kconfig~m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs drivers/macintosh/Kconfig --- a/drivers/macintosh/Kconfig~m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs +++ a/drivers/macintosh/Kconfig @@ -176,6 +176,7 @@ config THERM_PM72 config WINDFARM tristate "New PowerMac thermal control infrastructure" + depends on PPC config WINDFARM_PM81 tristate "Support for thermal management on iMac G5" _ Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are sctp_unpack_cookie-fix.patch fix-broken-uses-of-nipquad-in-net-atm.patch m68k-trapsc-constraints.patch m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs.patch inotify-add-names-inode-to-event-handler.patch inotify-add-interfaces-to-kernel-api.patch inotify-allow-watch-removal-from-event-handler.patch inotify-update-kernel-documentation.patch affs_fill_super-%s-abuses.patch slab-leaks3-default-y.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