diff options
| author | Dave Jones <davej@redhat.com> | 2010-09-29 12:30:26 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2010-09-29 12:30:26 -0400 |
| commit | 503653df9ef399a427f93ce6317b7b56b418566f (patch) | |
| tree | 909fb56b291703ef63c7ded34f4198be8fe9b1f1 | |
| parent | 3aa5eb118f8fed154b7f282638fd3a98f6687166 (diff) | |
| download | kernel-503653df9ef399a427f93ce6317b7b56b418566f.tar.gz kernel-503653df9ef399a427f93ce6317b7b56b418566f.tar.xz kernel-503653df9ef399a427f93ce6317b7b56b418566f.zip | |
Enable IB700 watchdog (used by qemu/kvm). (#637152)
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 6f99259e2..b9f622866 100644 --- a/config-generic +++ b/config-generic @@ -2206,7 +2206,7 @@ CONFIG_WDTPCI=m # CONFIG_ACQUIRE_WDT is not set # CONFIG_ADVANTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set -# CONFIG_IB700_WDT is not set +CONFIG_IB700_WDT=m # CONFIG_MIXCOMWD is not set # CONFIG_SCx200_WDT is not set # CONFIG_60XX_WDT is not set diff --git a/kernel.spec b/kernel.spec index a8a807407..b42884a48 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1930,6 +1930,9 @@ fi # || || %changelog +* Wed Sep 29 2010 Dave Jones <davej@redhat.com> +- Enable IB700 watchdog (used by qemu/kvm). (#637152) + * Tue Sep 28 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.28.rc6 - Linux 2.6.36-rc6 |