[media] solo6x10: drop video_type and add proper s_std support

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --cc drivers/staging/media/solo6x10/core.c
Simple merge

diff --cc drivers/staging/media/solo6x10/disp.c
Simple merge

diff --cc drivers/staging/media/solo6x10/solo6x10.h
Simple merge

diff --cc drivers/staging/media/solo6x10/tw28.c
Simple merge

diff --cc drivers/staging/media/solo6x10/v4l2-enc.c
Simple merge

diff --cc drivers/staging/media/solo6x10/v4l2.c
Simple merge