diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
| commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
| tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /drivers/media/video/em28xx/em28xx-reg.h | |
| parent | 805423e84e900e56c834aadee61a020b0d5092c3 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-reg.h')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h index a2676d63cfd0..6bf84bd787df 100644 --- a/drivers/media/video/em28xx/em28xx-reg.h +++ b/drivers/media/video/em28xx/em28xx-reg.h | |||
| @@ -176,7 +176,8 @@ | |||
| 176 | 176 | ||
| 177 | /* FIXME: Need to be populated with the other chip ID's */ | 177 | /* FIXME: Need to be populated with the other chip ID's */ |
| 178 | enum em28xx_chip_id { | 178 | enum em28xx_chip_id { |
| 179 | CHIP_ID_EM2820 = 18, /* Also used by em2710 */ | 179 | CHIP_ID_EM2710 = 17, |
| 180 | CHIP_ID_EM2820 = 18, /* Also used by some em2710 */ | ||
| 180 | CHIP_ID_EM2840 = 20, | 181 | CHIP_ID_EM2840 = 20, |
| 181 | CHIP_ID_EM2750 = 33, | 182 | CHIP_ID_EM2750 = 33, |
| 182 | CHIP_ID_EM2860 = 34, | 183 | CHIP_ID_EM2860 = 34, |