[Xen-changelog] manual merge.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1325, 2005/03/19 20:41:04+00:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        manual merge.



 xen0_defconfig |   10 ----------
 1 files changed, 10 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig 
b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig   2005-03-19 
16:04:36 -05:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig   2005-03-19 
16:04:36 -05:00
@@ -900,16 +900,6 @@
 # CONFIG_INFINIBAND is not set
 
 #
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-
-#
 # File systems
 #
 CONFIG_EXT2_FS=y


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/xen-changelog