diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-01 09:16:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:52:16 -0400 |
commit | ebaefdb7651383645f17d2d32398914175d1bcdd (patch) | |
tree | dd3007be4d8890e7ec0ef9848b77852c44ffee69 | |
parent | 460312ec5aff5e4c12b2e50a2965ed1ee832682a (diff) |
[media] em28xx: use the proper prefix for board names
All boards use EM28xxx_BOARD, to identify that the macro
refers to a card entry. So:
EM2874_LEADERSHIP_ISDBT -> EM2874_BOARD_LEADERSHIP_ISDBT
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index f15c73469ee7..7635a45a1220 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1259,7 +1259,7 @@ struct em28xx_board em28xx_boards[] = { | |||
1259 | } }, | 1259 | } }, |
1260 | }, | 1260 | }, |
1261 | 1261 | ||
1262 | [EM2874_LEADERSHIP_ISDBT] = { | 1262 | [EM2874_BOARD_LEADERSHIP_ISDBT] = { |
1263 | .i2c_speed = EM2874_I2C_SECONDARY_BUS_SELECT | | 1263 | .i2c_speed = EM2874_I2C_SECONDARY_BUS_SELECT | |
1264 | EM28XX_I2C_CLK_WAIT_ENABLE | | 1264 | EM28XX_I2C_CLK_WAIT_ENABLE | |
1265 | EM28XX_I2C_FREQ_100_KHZ, | 1265 | EM28XX_I2C_FREQ_100_KHZ, |
@@ -1937,7 +1937,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = { | |||
1937 | {0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT}, | 1937 | {0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT}, |
1938 | {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC}, | 1938 | {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC}, |
1939 | {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF}, | 1939 | {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF}, |
1940 | {0x6b800080, EM2874_LEADERSHIP_ISDBT, TUNER_ABSENT}, | 1940 | {0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT}, |
1941 | }; | 1941 | }; |
1942 | 1942 | ||
1943 | /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */ | 1943 | /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */ |
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index 7904ca4b6913..012ab8ec19cf 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
@@ -546,7 +546,7 @@ static int dvb_init(struct em28xx *dev) | |||
546 | em28xx_set_mode(dev, EM28XX_DIGITAL_MODE); | 546 | em28xx_set_mode(dev, EM28XX_DIGITAL_MODE); |
547 | /* init frontend */ | 547 | /* init frontend */ |
548 | switch (dev->model) { | 548 | switch (dev->model) { |
549 | case EM2874_LEADERSHIP_ISDBT: | 549 | case EM2874_BOARD_LEADERSHIP_ISDBT: |
550 | dvb->fe[0] = dvb_attach(s921_attach, | 550 | dvb->fe[0] = dvb_attach(s921_attach, |
551 | &sharp_isdbt, &dev->i2c_adap); | 551 | &sharp_isdbt, &dev->i2c_adap); |
552 | 552 | ||
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 3cca33122450..28b9954d9326 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -117,7 +117,7 @@ | |||
117 | #define EM2800_BOARD_VC211A 74 | 117 | #define EM2800_BOARD_VC211A 74 |
118 | #define EM2882_BOARD_DIKOM_DK300 75 | 118 | #define EM2882_BOARD_DIKOM_DK300 75 |
119 | #define EM2870_BOARD_KWORLD_A340 76 | 119 | #define EM2870_BOARD_KWORLD_A340 76 |
120 | #define EM2874_LEADERSHIP_ISDBT 77 | 120 | #define EM2874_BOARD_LEADERSHIP_ISDBT 77 |
121 | #define EM28174_BOARD_PCTV_290E 78 | 121 | #define EM28174_BOARD_PCTV_290E 78 |
122 | 122 | ||
123 | 123 | ||