From 1fe430d5b03cde790f53969d500ad3ea2b04274b Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 31 Dec 2008 06:37:50 -0300
Subject: [PATCH] --- yaml --- r: 125541 b: refs/heads/master c:
 87ea5f9d389717ff6da60dc014ce79ae14b7947c h: refs/heads/master i:   125539:
 6d123ff6f9f6569e18cc8daac463edf7f5e95022 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-reg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 479e9bca8ec0..e972365d2757 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e6de7d9a1a373414a41a7441100f90b71c6119f
+refs/heads/master: 87ea5f9d389717ff6da60dc014ce79ae14b7947c
diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h
index 65dcb91bdcc2..24e39c56811e 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-reg.h
+++ b/trunk/drivers/media/video/em28xx/em28xx-reg.h
@@ -160,7 +160,7 @@
 
 /* FIXME: Need to be populated with the other chip ID's */
 enum em28xx_chip_id {
-	CHIP_ID_EM2820 = 18,
+	CHIP_ID_EM2820 = 18,	/* Also used by em2710 */
 	CHIP_ID_EM2840 = 20,
 	CHIP_ID_EM2750 = 33,
 	CHIP_ID_EM2860 = 34,