diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-30 02:16:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 02:16:50 +0200 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /drivers/media/video/em28xx/em28xx-reg.h | |
| parent | Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/po... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| download | linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.tar.xz linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-reg.h')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h index 9058bed07953..fac1ab23f621 100644 --- a/drivers/media/video/em28xx/em28xx-reg.h +++ b/drivers/media/video/em28xx/em28xx-reg.h @@ -84,5 +84,6 @@ /* FIXME: Need to be populated with the other chip ID's */ enum em28xx_chip_id { + CHIP_ID_EM2860 = 34, CHIP_ID_EM2883 = 36, }; |