commit 65e9d805e96c7e6a15c1e3b0c00a842d2249bab8
author Ben Hutchings <ben@decadent.org.uk> Mon Dec 05 19:44:22 2011 +0000
committer David S. Miller <davem@davemloft.net> Tue Dec 06 00:48:59 2011 -0500
tree 7291358278ce3770f9a2e07107ae27c7335d81e2
parent 6b84bd167458545f0806d5a1a8a102004365d44e

pasemi_mac: Fix building as module

Commit ded19addf9c937d83b9bfb4d73a836732569041b ('pasemic_mac*: Move
the PA Semi driver') inadvertently split pasemi_mac into two separate
modules with unresolved symbols.  Change it back into a single module.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/ethernet/pasemi/Makefile

diff --git a/drivers/net/ethernet/pasemi/Makefile b/drivers/net/ethernet/pasemi/Makefile
index 05db543..90497ff 100644
--- a/drivers/net/ethernet/pasemi/Makefile
+++ b/drivers/net/ethernet/pasemi/Makefile
@@ -2,4 +2,5 @@
 # Makefile for the A Semi network device drivers.
 #
 
-obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
+pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o