media: Enable VIDEO_STK1160_COMMON (new dependency of VIDEO_STK1160) as module (Closes: #735870)

svn path=/dists/sid/linux/; revision=20980
This commit is contained in:
Ben Hutchings 2014-01-19 19:10:33 +00:00
parent a899464afd
commit cd02f5a790
2 changed files with 3 additions and 0 deletions

2
debian/changelog vendored
View File

@ -135,6 +135,8 @@ linux (3.12.8-1) UNRELEASED; urgency=low
- rcutree/rcu_bh_qs: disable irq while calling rcu_preempt_qs()
* Revert "net: unix: allow set_peek_off to fail", included in 3.12.8,
as it would cause an ABI change
* media: Enable VIDEO_STK1160_COMMON (new dependency of VIDEO_STK1160)
as module (Closes: #735870)
[ Ian Campbell ]
* [armel/kirkwood] Fix interrupt handling on non-DT platforms (Closes: #735172)

View File

@ -1747,6 +1747,7 @@ CONFIG_USB_SN9C102=m
##
## file: drivers/media/usb/stk1160/Kconfig
##
CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160=m
CONFIG_VIDEO_STK1160_AC97=y