diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-11 08:13:01 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-11 08:13:01 -0200 |
| commit | 7d69c5a6fde46835d5080e493e283758527e626a (patch) | |
| tree | 9a82ad81841aae9d1907dda7d52a0a15b6c35933 /linux/drivers/media/dvb | |
| parent | 75aa5f959597ca484cc55d82d3d7c0f7f2d7d93d (diff) | |
| parent | a9bc2471b07319062901a6778151ded75d7ef94d (diff) | |
| download | mediapointer-dvb-s2-7d69c5a6fde46835d5080e493e283758527e626a.tar.gz mediapointer-dvb-s2-7d69c5a6fde46835d5080e493e283758527e626a.tar.bz2 | |
Merging manu tree
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/bt878.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dst.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/bt878.c b/linux/drivers/media/dvb/bt8xx/bt878.c index d276ce6b3..5500f8a0f 100644 --- a/linux/drivers/media/dvb/bt8xx/bt878.c +++ b/linux/drivers/media/dvb/bt8xx/bt878.c @@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet * EXPORT_SYMBOL(bt878_device_control); -struct cards card_list[] __devinitdata = { +static struct cards card_list[] __devinitdata = { { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" }, diff --git a/linux/drivers/media/dvb/bt8xx/dst.c b/linux/drivers/media/dvb/bt8xx/dst.c index d800df121..1cfa5e503 100644 --- a/linux/drivers/media/dvb/bt8xx/dst.c +++ b/linux/drivers/media/dvb/bt8xx/dst.c @@ -602,7 +602,7 @@ static int dst_type_print(u8 type) */ -struct dst_types dst_tlist[] = { +static struct dst_types dst_tlist[] = { { .device_id = "200103A", .offset = 0, |