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

[Thomas Baechler]

    Date: Sunday, October 12, 2008 @ 09:05:37
  Author: thomas
Revision: 15059

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

........
  r15045 | thomas | 2008-10-12 14:20:31 +0200 (So, 12 Okt 2008) | 2 lines
  
  Add MSI support (#10900) and watchdog timer support (#11201)
........

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      |    6 ++---
 config        |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 config.x86_64 |   51 +++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 107 insertions(+), 9 deletions(-)


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

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-10-12 13:03:20 UTC (rev 15058)
+++ testing-x86_64/PKGBUILD	2008-10-12 13:05:37 UTC (rev 15059)
@@ -4,7 +4,7 @@
 pkgname=kernel26
 _basekernel=2.6.27
 pkgver=2.6.27
-pkgrel=1
+pkgrel=2
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
@@ -30,8 +30,8 @@
         kernel26.preset)
 md5sums=('b3e78977aa79d3754cb7f8143d7ddabd'
          'bbeba9d335907408876bb1e953f68e84'
-         '19e3b448daff64838b01c82c4fc3d0f1'
-         '0a579d0a01da9666d2c6f5a8883c6141'
+         '8b8360aaa4914fc169268907fa4d379b'
+         '430527c0c4f949a326c8264ab2665a30'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2008-10-12 13:03:20 UTC (rev 15058)
+++ testing-x86_64/config	2008-10-12 13:05:37 UTC (rev 15059)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27
-# Fri Oct 10 13:05:01 2008
+# Sun Oct 12 14:17:46 2008
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -422,7 +422,7 @@
 CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_HT_IRQ=y
@@ -2370,9 +2370,62 @@
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+CONFIG_WDT_501=y
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_WDT_501_PCI=y
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+
+#
 # Sonics Silicon Backplane
 #
 CONFIG_SSB_POSSIBLE=y

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2008-10-12 13:03:20 UTC (rev 15058)
+++ testing-x86_64/config.x86_64	2008-10-12 13:05:37 UTC (rev 15059)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27
-# Fri Oct 10 13:04:57 2008
+# Sun Oct 12 14:17:49 2008
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -383,12 +383,13 @@
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
+# CONFIG_DMAR is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_HT_IRQ=y
@@ -2215,9 +2216,53 @@
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_WDT_501_PCI=y
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+
+#
 # Sonics Silicon Backplane
 #
 CONFIG_SSB_POSSIBLE=y