1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 452da70e719f..4d20cda7a1fa 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -93,28 +93,6 @@ struct em28xx_board em28xx_boards[] = {
                        .amux     = 0,
                } },
        },
-        [EM2800_BOARD_KWORLD_USB2800] = {
-                .name         = "Kworld USB2800",
-                .valid        = EM28XX_BOARD_NOT_VALIDATED,
-                .is_em2800    = 1,
-                .vchannels    = 3,
-                .tuner_type   = TUNER_PHILIPS_FCV1236D,
-                .tda9887_conf = TDA9887_PRESENT,
-                .decoder      = EM28XX_SAA7113,
-                .input          = { {
-                        .type     = EM28XX_VMUX_TELEVISION,
-                        .vmux     = SAA7115_COMPOSITE2,
-                        .amux     = 0,
-                }, {
-                        .type     = EM28XX_VMUX_COMPOSITE1,
-                        .vmux     = SAA7115_COMPOSITE0,
-                        .amux     = 1,
-                }, {
-                        .type     = EM28XX_VMUX_SVIDEO,
-                        .vmux     = SAA7115_SVIDEO3,
-                        .amux     = 1,
-                } },
-        },
        [EM2820_BOARD_KWORLD_PVRTV2800RF] = {
                .name         = "Kworld PVR TV 2800 RF",
                .is_em2800    = 0,

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 452da70e719f..4d20cda7a1fa 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -93,28 +93,6 @@ struct em28xx_board em28xx_boards[] = {
93	.amux = 0,	93	.amux = 0,
94	} },	94	} },
95	},	95	},
96	[EM2800_BOARD_KWORLD_USB2800] = {
97	.name = "Kworld USB2800",
98	.valid = EM28XX_BOARD_NOT_VALIDATED,
99	.is_em2800 = 1,
100	.vchannels = 3,
101	.tuner_type = TUNER_PHILIPS_FCV1236D,
102	.tda9887_conf = TDA9887_PRESENT,
103	.decoder = EM28XX_SAA7113,
104	.input = { {
105	.type = EM28XX_VMUX_TELEVISION,
106	.vmux = SAA7115_COMPOSITE2,
107	.amux = 0,
108	}, {
109	.type = EM28XX_VMUX_COMPOSITE1,
110	.vmux = SAA7115_COMPOSITE0,
111	.amux = 1,
112	}, {
113	.type = EM28XX_VMUX_SVIDEO,
114	.vmux = SAA7115_SVIDEO3,
115	.amux = 1,
116	} },
117	},
118	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {	96	[EM2820_BOARD_KWORLD_PVRTV2800RF] = {
119	.name = "Kworld PVR TV 2800 RF",	97	.name = "Kworld PVR TV 2800 RF",
120	.is_em2800 = 0,	98	.is_em2800 = 0,