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

[Tobias Powalowski]

    Date: Sunday, August 10, 2008 @ 09:03:57
  Author: tpowa
Revision: 8269

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

........
  r8267 | tpowa | 2008-08-10 12:50:43 +0000 (So, 10 Aug 2008) | 1 line
  
  upgpkg: kernel26 2.6.26.2-1
........

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

---------------+
 PKGBUILD      |    9 ++-------
 config        |   12 ++++++------
 config.x86_64 |   17 ++++-------------
 3 files changed, 12 insertions(+), 26 deletions(-)


Property changes on: kernel26/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kernel26/trunk:1-6524
   + /kernel26/trunk:1-8268

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-08-10 12:51:17 UTC (rev 8268)
+++ testing-i686/PKGBUILD	2008-08-10 13:03:57 UTC (rev 8269)
@@ -3,8 +3,8 @@
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=kernel26
 _basekernel=2.6.26
-pkgver=2.6.26
-pkgrel=2
+pkgver=2.6.26.2
+pkgrel=1
 #_patchname="patch-${pkgver}-${pkgrel}-ARCH"
 _patchname="patch-${pkgver}-1-ARCH"
 pkgdesc="The Linux Kernel and modules"
@@ -28,11 +28,6 @@
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
-md5sums=('5169d01c405bc3f866c59338e217968c'
-         '97bb7a80a705d169b926992f28b95b52'
-         'e6ba4100b7c119b62bb13a940d54df23'
-         '282141bcbe91d4256b1d13ff5fe4c551'
-         '25584700a0a679542929c4bed31433b6')
 
 build() {
   KARCH=x86

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2008-08-10 12:51:17 UTC (rev 8268)
+++ testing-i686/config	2008-08-10 13:03:57 UTC (rev 8269)
@@ -76,17 +76,17 @@
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
-CONFIG_CGROUPS=y
+# CONFIG_CGROUPS is not set
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
+# CONFIG_CGROUP_NS is not set
 # CONFIG_CGROUP_DEVICE is not set
 # CONFIG_CPUSETS is not set
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_HAVE_UNSTABLE_SCHED_CLOCK is not set
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_FAIR_GROUP_SCHED is not set
 # CONFIG_RT_GROUP_SCHED is not set
 # CONFIG_USER_SCHED is not set
-CONFIG_CGROUP_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
 # CONFIG_CGROUP_CPUACCT is not set
 # CONFIG_RESOURCE_COUNTERS is not set
 CONFIG_SYSFS_DEPRECATED=y

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2008-08-10 12:51:17 UTC (rev 8268)
+++ testing-i686/config.x86_64	2008-08-10 13:03:57 UTC (rev 8269)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26
-# Mon Jul 21 19:06:27 2008
+# Sun Aug 10 13:51:28 2008
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -76,19 +76,9 @@
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
+# CONFIG_CGROUPS is not set
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_GROUP_SCHED=y
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-CONFIG_CGROUP_SCHED=y
-# CONFIG_CGROUP_CPUACCT is not set
-# CONFIG_RESOURCE_COUNTERS is not set
+# CONFIG_GROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_RELAY=y
@@ -2343,6 +2333,7 @@
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y