diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 08:31:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 08:31:48 +0200 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /drivers/staging/media/solo6x10/Kconfig | |
| parent | d752b2696072ed52fd5afab08b601e2220a3b87e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
| download | op-kernel-dev-5f0e5afa0de4522abb3ea7d1369039b94e740ec5.zip op-kernel-dev-5f0e5afa0de4522abb3ea7d1369039b94e740ec5.tar.gz | |
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/staging/media/solo6x10/Kconfig')
| -rw-r--r-- | drivers/staging/media/solo6x10/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/media/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig index ec32776..34f3b6d 100644 --- a/drivers/staging/media/solo6x10/Kconfig +++ b/drivers/staging/media/solo6x10/Kconfig @@ -1,9 +1,11 @@ config SOLO6X10 tristate "Softlogic 6x10 MPEG codec cards" depends on PCI && VIDEO_DEV && SND && I2C + depends on FONTS select VIDEOBUF2_DMA_SG select VIDEOBUF2_DMA_CONTIG select SND_PCM + select FONT_8x16 ---help--- This driver supports the Softlogic based MPEG-4 and h.264 codec cards. |
