[kernel] r10687 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386

[Maximilian Attems]

Author: maks
Date: Mon Mar  3 15:14:28 2008
New Revision: 10687

Log:
x86 enable HP_WATCHDOG

driver HP Proliant iLO 2 Hardware Watchdog Timer


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Mar  3 15:14:28 2008
@@ -17,7 +17,7 @@
     SCSI_ENCLOSURE, SENSORS_ADT7473, SCSI_MVSAS.
   * [amd64] Enable CRYPTO_SALSA20_X86_64, EDAC_I3000.
   * [amd64, i386]: Enable LATENCYTOP, LEDS_CLEVO_MAIL, INPUT_APANEL, ACER_WMI,
-    THINKPAD_ACPI_HOTKEY_POLL.
+    THINKPAD_ACPI_HOTKEY_POLL, HP_WATCHDOG.
   * topconfig disable PARPORT_PC_FIFO due to instabilities.
     (closes: #366165, #388309, #406056, #407816, #453911)
   * [amd64, i386]: Enable SONYPI_COMPAT for better sony laptop support.

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Mon Mar  3 15:14:28 2008
@@ -751,6 +751,7 @@
 CONFIG_IB700_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_IT8712F_WDT=m
+CONFIG_HP_WATCHDOG=m
 CONFIG_SC1200_WDT=m
 CONFIG_60XX_WDT=m
 CONFIG_CPU5_WDT=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Mon Mar  3 15:14:28 2008
@@ -324,6 +324,7 @@
 CONFIG_BLK_DEV_HPT34X=m
 # CONFIG_HPT34X_AUTODMA is not set
 CONFIG_BLK_DEV_HPT366=m
+CONFIG_HP_WATCHDOG=m
 CONFIG_BLK_DEV_SC1200=m
 CONFIG_BLK_DEV_PIIX=m
 CONFIG_BLK_DEV_NS87415=m