The patch titled net: smc91x: Build fixes for general sh boards. has been added to the -mm tree. Its filename is net-smc91x-build-fixes-for-general-sh-boards.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: net: smc91x: Build fixes for general sh boards. From: Paul Mundt <lethal@xxxxxxxxxxxx> SH boards in general only wire this up in 8 or 16-bit mode, and as we never had the wrappers for 32-bit mode defined, SMC_CAN_USE_32BIT caused build failure for the non-Solution Engine boards. This gets it building again. Also kill off the straggling set_irq_type() definition, this is left over cruft that was missed when the rest of it switched to IRQ flags. Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/smc91x.h | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) diff -puN drivers/net/smc91x.h~net-smc91x-build-fixes-for-general-sh-boards drivers/net/smc91x.h --- a/drivers/net/smc91x.h~net-smc91x-build-fixes-for-general-sh-boards +++ a/drivers/net/smc91x.h @@ -299,7 +299,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, #define SMC_CAN_USE_8BIT 1 #define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 +#define SMC_CAN_USE_32BIT 0 #define SMC_inb(a, r) inb((a) + (r)) #define SMC_inw(a, r) inw((a) + (r)) @@ -310,8 +310,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, #endif /* BOARDS */ -#define set_irq_type(irq, type) do {} while (0) - #elif defined(CONFIG_M32R) #define SMC_CAN_USE_8BIT 0 _ Patches currently in -mm which might be from lethal@xxxxxxxxxxxx are origin.patch fix-warn_on-on-bitfield-ops-for-all-other-archs.patch cpufreq-move-policys-governor-initialisation-out-of-low-level-drivers-into-cpufreq-core.patch cpufreq-allow-ondemand-and-conservative-cpufreq-governors-to-be-used-as-default.patch net-smc91x-build-fixes-for-general-sh-boards.patch git-sh.patch sh64-arch-sh64-kernel-signalh-duplicate-include-removal.patch nohz-fix-nohz-x86-dyntick-idle-handling.patch serial-sh-sci-fix-build-failure-from-kgdb-fallout.patch during-vm-oom-condition-kill-all-threads-in-process-group.patch clean-up-duplicate-includes-in-mm.patch printk-add-interfaces-for-external-access-to-the-log-buffer.patch printk-add-interfaces-for-external-access-to-the-log-buffer-fix.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