Skip to content

Commit

Permalink
V4L/DVB: saa5246a/saa5249: Remove obsolete teletext drivers
Browse files Browse the repository at this point in the history
These old i2c teletext drivers are not supported by any hardware and cannot be
tested anymore.

Note that while the mxb board seemingly used the saa5246a driver, in reality
this teletext driver never worked.

These drivers are removed as part of the vtx feature removal, originally
scheduled for 2.6.35.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent be96624 commit 563711f
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 1,800 deletions.
20 changes: 0 additions & 20 deletions drivers/media/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -641,26 +641,6 @@ config VIDEO_CPIA_USB

source "drivers/media/video/cpia2/Kconfig"

config VIDEO_SAA5246A
tristate "SAA5246A, SAA5281 Teletext processor"
depends on I2C && VIDEO_V4L2
help
Support for I2C bus based teletext using the SAA5246A or SAA5281
chip. Useful only if you live in Europe.

To compile this driver as a module, choose M here: the
module will be called saa5246a.

config VIDEO_SAA5249
tristate "SAA5249 Teletext processor"
depends on I2C && VIDEO_V4L2
help
Support for I2C bus based teletext using the SAA5249 chip. At the
moment this is only useful on some European WinTV cards.

To compile this driver as a module, choose M here: the
module will be called saa5249.

config VIDEO_VINO
tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
Expand Down
2 changes: 0 additions & 2 deletions drivers/media/video/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o
obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o
obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o
obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o
obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o
Expand Down
5 changes: 0 additions & 5 deletions drivers/media/video/mxb.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "tea6415c.h"
#include "tea6420.h"

#define I2C_SAA5246A 0x11
#define I2C_SAA7111A 0x24
#define I2C_TDA9840 0x42
#define I2C_TEA6415C 0x43
Expand Down Expand Up @@ -197,10 +196,6 @@ static int mxb_probe(struct saa7146_dev *dev)
"tda9840", "tda9840", I2C_TDA9840, NULL);
mxb->tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
"tuner", "tuner", I2C_TUNER, NULL);
if (v4l2_i2c_new_subdev(&dev->v4l2_dev, &mxb->i2c_adapter,
"saa5246a", "saa5246a", I2C_SAA5246A, NULL)) {
printk(KERN_INFO "mxb: found teletext decoder\n");
}

/* check if all devices are present */
if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c ||
Expand Down
Loading

0 comments on commit 563711f

Please sign in to comment.