From: David S. Miller Date: Wed, 30 Sep 2015 04:11:13 +0000 (-0700) Subject: Merge branch 'm68k-netdev-modular' X-Git-Tag: MMI-PSA29.97-13-9~9125^2~246 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=79b0eb2aadfefaecb34c84453bd44d3264c4c781;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'm68k-netdev-modular' Geert Uytterhoeven says: ==================== net: m68k: Allow modular build This patch series makes the remaining m68k Ethernet drivers modular. It's an alternative to the last 3 patches of Paul Gortmaker's series "[PATCH net-next 0/6] make non-modular code explicitly non-modular". Note that "[PATCH 5/5] net: macmace: Allow modular build" depends on "[PATCH 4/5] m68k/mac: Export Peripheral System Controller (PSC) base address to modules". Feel free to take the dependency through the netdev tree to avoid modular build breakage. This was compile-tested only (mac_defconfig + allmodconfig) due to lack of hardware. ==================== Signed-off-by: David S. Miller --- 79b0eb2aadfefaecb34c84453bd44d3264c4c781