--- 1019/linux-2.4.26-xen-sparse/arch/xen/config.in	Fri Jun 25 15:03:01 2004
+++ 1009/linux-2.4.26-xen-sparse/arch/xen/config.in	Wed Jun 23 23:33:08 2004
@@ -173,17 +173,21 @@
       define_bool CONFIG_BLK_DEV_HD n
    fi
    endmenu
+else
+   define_bool CONFIG_NETDEVICES y
+fi
 
-   mainmenu_option next_comment
-   comment 'SCSI support'
+mainmenu_option next_comment
+comment 'SCSI support'
 
-   tristate 'SCSI support' CONFIG_SCSI
+tristate 'SCSI support' CONFIG_SCSI
 
-   if [ "$CONFIG_SCSI" != "n" ]; then
-      source drivers/scsi/Config.in
-   fi
-   endmenu
+if [ "$CONFIG_SCSI" != "n" ]; then
+   source drivers/scsi/Config.in
+fi
+endmenu
 
+if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then
    source drivers/message/fusion/Config.in
 
    source drivers/ieee1394/Config.in
@@ -234,18 +238,6 @@
    #
    source drivers/input/Config.in
 else
-   define_bool CONFIG_NETDEVICES y
-
-   mainmenu_option next_comment
-   comment 'SCSI support'
-
-   tristate 'SCSI support' CONFIG_SCSI
-
-   if [ "$CONFIG_SCSI" != "n" ]; then
-      source drivers/scsi/Config.in
-   fi
-   endmenu
-
    #
    # Block device driver configuration
    #