Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Sander van der Burg 2013-05-16 12:18:46 +02:00
commit 64e8c45576

View File

@ -238,6 +238,9 @@ let
DEVTMPFS y
# Media support
MEDIA_SUPPORT y
MEDIA_DIGITAL_TV_SUPPORT y
MEDIA_CAMERA_SUPPORT? y
MEDIA_RC_SUPPORT? y
MEDIA_USB_SUPPORT y