[kernel] r9417 - in dists/trunk/linux-2.6/debian/config: featureset-xen i386/xen

[Bastian Blank]

Author: waldi
Date: Wed Aug 29 13:36:03 2007
New Revision: 9417

Log:
* debian/config/featureset-xen/config: Disable some impossible options.
* debian/config/i386/xen/config: Remove.
* debian/config/i386/xen/defines: Update.


Removed:
   dists/trunk/linux-2.6/debian/config/i386/xen/config
Modified:
   dists/trunk/linux-2.6/debian/config/featureset-xen/config
   dists/trunk/linux-2.6/debian/config/i386/xen/defines

Modified: dists/trunk/linux-2.6/debian/config/featureset-xen/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/featureset-xen/config	(original)
+++ dists/trunk/linux-2.6/debian/config/featureset-xen/config	Wed Aug 29 13:36:03 2007
@@ -1,23 +1,19 @@
-CONFIG_XEN_PCIDEV_FRONTEND=y
-# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-# CONFIG_XEN_BLKDEV_TAP is not set
-# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
-CONFIG_XEN_NETDEV_BACKEND=y
-# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-CONFIG_XEN_NETDEV_LOOPBACK=m
-CONFIG_XEN_PCIDEV_BACKEND=y
-CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
-# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
-# CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set
-# XEN_PCIDEV_BE_DEBUG is not set
-# CONFIG_XEN_TPMDEV_BACKEND is not set
+CONFIG_XEN=y
 CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_HVC_XEN=y
 CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DISABLE_SERIAL=y
-CONFIG_XEN_SYSFS=y
-CONFIG_XEN_COMPAT_030002_AND_LATER=y
-# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
+
+# CONFIG_VMI is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_PCCARD is not set
+# CONFIG_PARPORT is not set
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_IDE is not set
+

Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/defines	Wed Aug 29 13:36:03 2007
@@ -17,5 +17,7 @@
 longclass: i686 and compatible
 
 [686_image]
-configs: i386/config.686-bigmem
+configs:
+  i386/config.686-bigmem
+  i386/xen/config.686