summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-20 08:56:19 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 17:53:35 -0200
commit16c7bcadff2222b297d13951dc30e133f56d0154 (patch)
tree58b94dd4791f6fcd84ce5a6346c925e7f49ad728 /drivers/media/video/em28xx/em28xx.h
parent35643943be58aef82826e340761e86e0d37870ec (diff)
V4L/DVB (9652): em28xx: merge AC97 vendor id's into a single var
This makes easier to identify vendor ID, since AC97 vendors are generally identified by 3 bytes. The remaining byte is used by the vendor to identify its devices. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 3e8e13a55f5..d965caba63e 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -266,8 +266,7 @@ struct em28xx_audio_mode {
enum em28xx_ac97_mode ac97;
u16 ac97_feat;
- u16 ac97_vendor_id1;
- u16 ac97_vendor_id2;
+ u32 ac97_vendor_id;
unsigned int has_audio:1;