[powerpc] pasemi_mac: Fix building as module
svn path=/dists/trunk/linux-2.6/; revision=18357
This commit is contained in:
parent
b6177993e9
commit
c35b492ed9
|
@ -1,3 +1,10 @@
|
|||
linux-2.6 (3.2~rc4-1~experimental.2) UNRELEASED; urgency=low
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* [powerpc] pasemi_mac: Fix building as module
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 06 Dec 2011 04:31:19 +0000
|
||||
|
||||
linux-2.6 (3.2~rc4-1~experimental.1) experimental; urgency=low
|
||||
|
||||
* New upstream release candidate
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 6 Dec 2011 04:07:39 +0000
|
||||
Subject: [PATCH] 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>
|
||||
---
|
||||
drivers/net/ethernet/pasemi/Makefile | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
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
|
||||
--
|
||||
1.7.7.3
|
||||
|
|
@ -57,3 +57,4 @@
|
|||
|
||||
+ features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
|
||||
+ features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
|
||||
+ bugfix/powerpc/pasemi_mac-Fix-building-as-module.patch
|
||||
|
|
Loading…
Reference in New Issue