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

[Thomas Baechler]

    Date: Thursday, July 24, 2008 @ 16:21:50
  Author: thomas
Revision: 6524

Merged revisions 5847-6521 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kernel26/trunk

........
  r6521 | thomas | 2008-07-24 22:20:45 +0200 (Do, 24 Jul 2008) | 1 line
  
  upgpkg: kernel26 2.6.26-2
........

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      |    9 +++++----
 config        |    4 ++--
 config.x86_64 |    4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)


Property changes on: kernel26/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kernel26/trunk:1-5846
   + /kernel26/trunk:1-6521

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-07-24 20:21:06 UTC (rev 6523)
+++ testing-x86_64/PKGBUILD	2008-07-24 20:21:50 UTC (rev 6524)
@@ -4,8 +4,9 @@
 pkgname=kernel26
 _basekernel=2.6.26
 pkgver=2.6.26
-pkgrel=1
-_patchname="patch-${pkgver}-${pkgrel}-ARCH"
+pkgrel=2
+#_patchname="patch-${pkgver}-${pkgrel}-ARCH"
+_patchname="patch-${pkgver}-1-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -29,8 +30,8 @@
         kernel26.preset)
 md5sums=('5169d01c405bc3f866c59338e217968c'
          '97bb7a80a705d169b926992f28b95b52'
-         'e0c0c2e30734536df19a64af67f70e88'
-         '1f1ba2afa6c161c68c4474ecf57cb745'
+         'e6ba4100b7c119b62bb13a940d54df23'
+         '282141bcbe91d4256b1d13ff5fe4c551'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2008-07-24 20:21:06 UTC (rev 6523)
+++ testing-x86_64/config	2008-07-24 20:21:50 UTC (rev 6524)
@@ -2503,14 +2503,14 @@
 CONFIG_VIDEO_CX18=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
+CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_USBVIDEO=m
 CONFIG_USB_VICAM=m

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2008-07-24 20:21:06 UTC (rev 6523)
+++ testing-x86_64/config.x86_64	2008-07-24 20:21:50 UTC (rev 6524)
@@ -2342,14 +2342,14 @@
 CONFIG_VIDEO_CX18=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
+CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_USBVIDEO=m
 CONFIG_USB_VICAM=m