Did you try getting the Ubuntu patches applied in the linuxtv.org repo so that they don't need to be maintained by you?
Did you try getting the Ubuntu patches applied in the linuxtv.org repo so that they don't need to be maintained by you?