git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
media
/
solo6x10
/
Kconfig
diff --git
a/drivers/staging/media/solo6x10/Kconfig
b/drivers/staging/media/solo6x10/Kconfig
index df6569b997b88269bfdb48fd17dc410a0da50c0a..34f3b6d02d2a4075b423d1adcca0c62b5f949c96 100644
(file)
--- a/
drivers/staging/media/solo6x10/Kconfig
+++ b/
drivers/staging/media/solo6x10/Kconfig
@@
-5,6
+5,7
@@
config SOLO6X10
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.