diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 10:31:48 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 10:31:48 +0400 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /drivers/net/caif/Kconfig | |
| parent | d752b2696072ed52fd5afab08b601e2220a3b87e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
| download | linux-5f0e5afa0de4522abb3ea7d1369039b94e740ec5.tar.xz | |
Merge tag 'v3.10-rc7' into for-3.11/drivers
Linux 3.10-rc7
Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.
Diffstat (limited to 'drivers/net/caif/Kconfig')
| -rw-r--r-- | drivers/net/caif/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig index 7ffc756131a2..547098086773 100644 --- a/drivers/net/caif/Kconfig +++ b/drivers/net/caif/Kconfig @@ -43,7 +43,7 @@ config CAIF_HSI config CAIF_VIRTIO tristate "CAIF virtio transport driver" - depends on CAIF + depends on CAIF && HAS_DMA select VHOST_RING select VIRTIO select GENERIC_ALLOCATOR |