[kernel] r11269 - in dists/sid/linux-2.6/debian: . config/i386

[Maximilian Attems]

Author: maks
Date: Sun May  4 20:31:52 2008
New Revision: 11269

Log:
[x86]: Enable Xen guest support in all i386 flavours.

apply patch from Ian Campbell,
will allow the next d-i beta release to work as guest.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/i386/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun May  4 20:31:52 2008
@@ -46,6 +46,9 @@
   * [m68k] Add patches for 2.6.25.
   * [m68k] Disable EXT4DEV_FS for now.
   * [m68k] Enable SCSI_MAC_ESP for mac.
+ 
+  [ Ian Campbell ]
+  * [x86]: Enable Xen guest support in all i386 flavours.
   
  -- Christian T. Steigies <cts at debian.org>  Sat, 03 May 2008 14:12:54 +0200
 

Modified: dists/sid/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/config	(original)
+++ dists/sid/linux-2.6/debian/config/i386/config	Sun May  4 20:31:52 2008
@@ -149,7 +149,7 @@
 ##
 ## file: arch/x86/xen/Kconfig
 ##
-# CONFIG_XEN is not set
+CONFIG_XEN=y
 
 ##
 ## file: crypto/Kconfig
@@ -248,6 +248,7 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_VIRTIO_BLK=m
 
 ##
@@ -313,6 +314,7 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
+CONFIG_HVC_XEN=y
 CONFIG_NVRAM=m
 CONFIG_RTC=m
 CONFIG_GEN_RTC=m
@@ -1115,6 +1117,7 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set