[kernel] r15825 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86

[Moritz Muehlenhoff]

Author: jmm
Date: Sat Jun  5 08:04:31 2010
New Revision: 15825

Log:
Enable X86 board specific fixups for reboot (Closes: #536537)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Jun  3 01:02:13 2010	(r15824)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jun  5 08:04:31 2010	(r15825)
@@ -12,6 +12,9 @@
   [ Aurelien Jarno ]
   * [sh4] fix sh_tmu clocksource following recent nohz changes.
 
+  [ Moritz Muehlenhoff ]
+  * Enable X86 board specific fixups for reboot (Closes: #536537)
+
  -- dann frazier <dannf at debian.org>  Tue, 01 Jun 2010 09:23:57 -0600
 
 linux-2.6 (2.6.32-15) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Jun  3 01:02:13 2010	(r15824)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Sat Jun  5 08:04:31 2010	(r15825)
@@ -9,7 +9,7 @@
 CONFIG_NR_CPUS=32
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
-# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REBOOTFIXUPS=y
 ## choice: High Memory Support
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y