[media] cpia, stradis: remove deprecated V4L1 drivers
authorHans Verkuil <hverkuil@xs4all.nl>
Sat, 25 Dec 2010 10:44:33 +0000 (07:44 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 29 Dec 2010 10:17:08 +0000 (08:17 -0200)
Nobody stepped in to convert these drivers to V4L2, so they are now
removed from the kernel.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
16 files changed:
Documentation/video4linux/README.cpia [deleted file]
Documentation/video4linux/bttv/Cards
MAINTAINERS
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpia/Kconfig [deleted file]
drivers/staging/cpia/Makefile [deleted file]
drivers/staging/cpia/TODO [deleted file]
drivers/staging/cpia/cpia.c [deleted file]
drivers/staging/cpia/cpia.h [deleted file]
drivers/staging/cpia/cpia_pp.c [deleted file]
drivers/staging/cpia/cpia_usb.c [deleted file]
drivers/staging/stradis/Kconfig [deleted file]
drivers/staging/stradis/Makefile [deleted file]
drivers/staging/stradis/TODO [deleted file]
drivers/staging/stradis/stradis.c [deleted file]

diff --cc Documentation/video4linux/README.cpia
Simple merge
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc drivers/staging/cpia/Kconfig
Simple merge
diff --cc drivers/staging/cpia/Makefile
Simple merge
diff --cc drivers/staging/cpia/TODO
Simple merge
diff --cc drivers/staging/cpia/cpia.c
Simple merge
diff --cc drivers/staging/cpia/cpia.h
Simple merge
diff --cc drivers/staging/cpia/cpia_pp.c
Simple merge
diff --cc drivers/staging/cpia/cpia_usb.c
Simple merge
diff --cc drivers/staging/stradis/Kconfig
Simple merge
diff --cc drivers/staging/stradis/Makefile
Simple merge
diff --cc drivers/staging/stradis/TODO
Simple merge
diff --cc drivers/staging/stradis/stradis.c
Simple merge