enable r8169, remove -xtt from version, and move all virt specific options to one...

diff --git a/linux.config b/linux.config
index d44b4499a7f67be553f6e9b036d06933f575559b..804d3a38952c05f70f7ada9bd9a64f0d73b355a1 100644 (file)
--- a/linux.config
+++ b/linux.config
@@ -22,7 +22,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 #
-CONFIG_LOCALVERSION="-xtt"
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 
@@ -357,6 +356,7 @@ CONFIG_IGBVF=m
 # CONFIG_SK98LIN is not set
 CONFIG_SKY2=m
 CONFIG_BNX2=m
+CONFIG_R8169=m
 CONFIG_NETDEV_10000=y
 CONFIG_3C359=m
 
@@ -536,7 +536,7 @@ CONFIG_USB_MOUSE=m
 # CONFIG_WORKQUEUE_TRACER is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_IMA is not set
 CONFIG_CRYPTO_ZLIB=y
@@ -637,35 +637,6 @@ CONFIG_SCST_TRACING=y
 CONFIG_SCST_MEASURE_LATENCY=y
 
 
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
-CONFIG_XEN_DEBUG_FS=y
-CONFIG_VMI=y
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_KBDDEV_FRONTEND=m
-CONFIG_XEN_FBDEV_FRONTEND=m
-CONFIG_HVC_XEN=y
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_NET=m
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_BLKDEV_TAP=y
 
 CONFIG_STAGING=y
 CONFIG_DRM_NOUVEAU=m
@@ -715,6 +686,35 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_EFFICEON=y
 
 
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_XEN=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_DEBUG_FS=y
+CONFIG_VMI=y
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+CONFIG_LGUEST_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_SPINLOCKS=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_KBDDEV_FRONTEND=m
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_HVC_XEN=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_BLKDEV_TAP=y
 CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=y
 CONFIG_XEN_BACKEND=y
@@ -725,7 +725,7 @@ CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_PASS=y
 # CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set
 # CONFIG_XEN_PCIDEV_BACKEND_CONTROLLER is not set
-#
+
 CONFIG_HIGHMEM64G=y
 CONFIG_X86_PTDUMP=y
 CONFIG_DEBUG_INFO=y