[kernel] r18357 - in dists/trunk/linux-2.6/debian: . patches/bugfix/powerpc patches/series

[Ben Hutchings]

Author: benh
Date: Tue Dec  6 04:32:08 2011
New Revision: 18357

Log:
[powerpc] pasemi_mac: Fix building as module

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/pasemi_mac-Fix-building-as-module.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Dec  5 16:05:06 2011	(r18356)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Dec  6 04:32:08 2011	(r18357)
@@ -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 at 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

Added: dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/pasemi_mac-Fix-building-as-module.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/pasemi_mac-Fix-building-as-module.patch	Tue Dec  6 04:32:08 2011	(r18357)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at 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 at 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
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Dec  5 16:05:06 2011	(r18356)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue Dec  6 04:32:08 2011	(r18357)
@@ -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