diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2011-03-17 09:16:06 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2011-03-17 09:16:06 +0000 |
| commit | b2ca97ef073f757f850e7df200f4b38bc74ed5ec (patch) | |
| tree | 4357b4cec46548fc80040239ec72a6841e3fdcce /freed-ora/current/master/config-generic | |
| parent | 2b640b7ca879059492a80ba5aca007fee4b9b9ac (diff) | |
| download | linux-libre-raptor-b2ca97ef073f757f850e7df200f4b38bc74ed5ec.tar.gz linux-libre-raptor-b2ca97ef073f757f850e7df200f4b38bc74ed5ec.zip | |
Merged from f15 before starting diverging.
Diffstat (limited to 'freed-ora/current/master/config-generic')
| -rw-r--r-- | freed-ora/current/master/config-generic | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/freed-ora/current/master/config-generic b/freed-ora/current/master/config-generic index b4b71eab7..344f5fc07 100644 --- a/freed-ora/current/master/config-generic +++ b/freed-ora/current/master/config-generic @@ -427,10 +427,8 @@ CONFIG_BLK_DEV_VIA82CXXX=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_BLK_DEV_HD is not set -CONFIG_VIRTIO=m CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_RING=m -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_NET=m CONFIG_VMXNET3=m |
