[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>