Merge commit 'origin' into master

[linux-2.6] / include / linux / dvb / Kbuild

header-y += ca.h
header-y += frontend.h
header-y += net.h
header-y += osd.h
header-y += version.h

unifdef-y += audio.h
unifdef-y += dmx.h
unifdef-y += video.h