[mchehab@redhat.com: second hunk of the original patch were already applied by another patch - remove it] Cc: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Duncan Gibb <dg@duncangibb.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>