This patch is applying some hunks that are already at changeset
c247d7b1, causing a compilation breakage.
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>