[arch-commits] Commit in kernel26-lts/trunk (BCM43XX.patch PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, August 10, 2010 @ 16:25:26
  Author: andyrtr
Revision: 87189

upgpkg: kernel26-lts 2.6.32.18-1
new version 2.6.32.18

Modified:
  kernel26-lts/trunk/PKGBUILD
Deleted:
  kernel26-lts/trunk/BCM43XX.patch

---------------+
 BCM43XX.patch |   18 ------------------
 PKGBUILD      |   15 +++++----------
 2 files changed, 5 insertions(+), 28 deletions(-)

Deleted: BCM43XX.patch
===================================================================
--- BCM43XX.patch	2010-08-10 20:05:16 UTC (rev 87188)
+++ BCM43XX.patch	2010-08-10 20:25:26 UTC (rev 87189)
@@ -1,18 +0,0 @@
-2.6.34.2: ssb: Fix error is SPROM offsets
-
-Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
-
-Index: linux-2.6.34.y/drivers/ssb/pci.c
-===================================================================
---- linux-2.6.34.y.orig/drivers/ssb/pci.c
-+++ linux-2.6.34.y/drivers/ssb/pci.c
-@@ -169,7 +169,7 @@ err_pci:
- }
- 
- /* Get the word-offset for a SSB_SPROM_XXX define. */
--#define SPOFF(offset)	((offset) / sizeof(u16))
-+#define SPOFF(offset)	(((offset) - SSB_SPROM_BASE1) / sizeof(u16))
- /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
- #define SPEX16(_outvar, _offset, _mask, _shift)	\
- 	out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-10 20:05:16 UTC (rev 87188)
+++ PKGBUILD	2010-08-10 20:25:26 UTC (rev 87189)
@@ -5,8 +5,8 @@
 pkgname=('kernel26-lts' 'kernel26-lts-headers') # Build stock -lts kernel
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.32
-pkgver=${_basekernel}.17
-pkgrel=2
+pkgver=${_basekernel}.18
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org"
@@ -15,14 +15,12 @@
 	# the main kernel config files
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
-        ${pkgname}.preset
-	BCM43XX.patch)
+        ${pkgname}.preset)
 md5sums=('260551284ac224c3a43c4adac7df4879'
-         'ca9a0f5c28803e9231dc9ee5b0faa863'
+         'dc2f0fab4d67f96e593708ba9158052b'
          '96ff0f63b9ef17cfa95a409cbf9b301e'
          'b614ef168f0bcfe2b3ae4ab6fbad971a'
-         'a13338958d1b241f8dfd4c6014cad3d4'
-         '033bdbc810f419af4f3e53bb8faaf828')
+         'a13338958d1b241f8dfd4c6014cad3d4')
 
 build() {
   cd ${srcdir}/linux-$_basekernel
@@ -31,9 +29,6 @@
      patch -Np1 -i ${srcdir}/patch-$pkgver
    fi
 
-  # fix broken broadcom lan and wlan cards. https://bugzilla.kernel.org/show_bug.cgi?id=16505
-  patch -Np1 -i $srcdir/BCM43XX.patch || return 1
-
   if [ "$CARCH" = "x86_64" ]; then
     cat ../config.x86_64 >./.config
   else