Merge pull request #135 from lrusak/virtio

Thanks much :)
This commit is contained in:
Christian Hewitt 2016-04-11 22:25:13 +04:00
commit fc5b4e7ce2

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 4.4.2 Kernel Configuration # Linux/x86 4.4.6 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -1144,7 +1144,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_RAM_SIZE=16384
# CONFIG_CDROM_PKTCDVD is not set # CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set # CONFIG_ATA_OVER_ETH is not set
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
# CONFIG_BLK_DEV_RBD is not set # CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set # CONFIG_BLK_DEV_RSXX is not set
@ -1292,7 +1292,7 @@ CONFIG_SCSI_MVSAS=y
# CONFIG_SCSI_ESAS2R is not set # CONFIG_SCSI_ESAS2R is not set
# CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_LEGACY is not set
CONFIG_MEGARAID_SAS=yes CONFIG_MEGARAID_SAS=y
# CONFIG_SCSI_MPT3SAS is not set # CONFIG_SCSI_MPT3SAS is not set
# CONFIG_SCSI_MPT2SAS is not set # CONFIG_SCSI_MPT2SAS is not set
# CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_UFSHCD is not set
@ -1445,7 +1445,7 @@ CONFIG_NET_POLL_CONTROLLER=y
CONFIG_TUN=y CONFIG_TUN=y
# CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TUN_VNET_CROSS_LE is not set
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_NET=y
# CONFIG_NLMON is not set # CONFIG_NLMON is not set
# CONFIG_ARCNET is not set # CONFIG_ARCNET is not set
@ -2077,7 +2077,7 @@ CONFIG_SERIAL_CORE=y
# CONFIG_SERIAL_FSL_LPUART is not set # CONFIG_SERIAL_FSL_LPUART is not set
# CONFIG_TTY_PRINTK is not set # CONFIG_TTY_PRINTK is not set
CONFIG_HVC_DRIVER=y CONFIG_HVC_DRIVER=y
CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_CONSOLE=y
# CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_HANDLER is not set
CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM=m
# CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_TIMERIOMEM is not set
@ -3897,16 +3897,16 @@ CONFIG_UIO=y
# CONFIG_UIO_PRUSS is not set # CONFIG_UIO_PRUSS is not set
# CONFIG_UIO_MF624 is not set # CONFIG_UIO_MF624 is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO=m CONFIG_VIRTIO=y
# #
# Virtio drivers # Virtio drivers
# #
CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_PCI_LEGACY=y
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_INPUT=y
CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_MMIO=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
# #