[arch-commits] Commit in kernel26/repos (4 files)

[Tobias Powalowski]

    Date: Saturday, December 26, 2009 @ 03:26:43
  Author: tpowa
Revision: 61812

Merged revisions 61811 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kernel26/trunk

........
  r61811 | tpowa | 2009-12-26 09:26:01 +0100 (Sa, 26 Dez 2009) | 2 lines
  
  upgpkg: kernel26 2.6.32.2-2
      fixed intel i915, changed radeon kms to off by default
........

Modified:
  kernel26/repos/testing-x86_64/	(properties)
  kernel26/repos/testing-x86_64/PKGBUILD
  kernel26/repos/testing-x86_64/config
  kernel26/repos/testing-x86_64/config.x86_64

---------------+
 PKGBUILD      |    8 ++++----
 config        |    2 +-
 config.x86_64 |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)


Property changes on: kernel26/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26/trunk:1-61613
   + /kernel26/trunk:1-61811

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-12-26 08:26:01 UTC (rev 61811)
+++ testing-x86_64/PKGBUILD	2009-12-26 08:26:43 UTC (rev 61812)
@@ -7,7 +7,7 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.32
 pkgver=${_basekernel}.2
-pkgrel=1
+pkgrel=2
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -19,9 +19,9 @@
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
 md5sums=('260551284ac224c3a43c4adac7df4879'
-         '648d6f8f5648fa29a60f27315391f153'
-         '10a2f090657cf32bb0698e7485dcd7cc'
-         '6eda51a18f5254cf98fb9e84413bbee6'
+         '57d123b271851aeee1b71a5f7f8245d5'
+         '8f2c9b66c60ab48082c8fdcc7ab7efc8'
+         'd2d438a3c950ef33d8e7655c1f3cca4b'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2009-12-26 08:26:01 UTC (rev 61811)
+++ testing-x86_64/config	2009-12-26 08:26:43 UTC (rev 61812)
@@ -4036,7 +4036,7 @@
 CONFIG_IDE_PHISON=m
 CONFIG_PLAN9AUTH=m
 CONFIG_LINE6_USB=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2009-12-26 08:26:01 UTC (rev 61811)
+++ testing-x86_64/config.x86_64	2009-12-26 08:26:43 UTC (rev 61812)
@@ -3837,7 +3837,7 @@
 CONFIG_IDE_PHISON=m
 CONFIG_PLAN9AUTH=m
 CONFIG_LINE6_USB=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m