From e44c48357f01d240132d27ca15d993d3939d0b2b Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <devin.heitmueller@gmail.com>
Date: Tue, 10 Jun 2008 12:35:42 -0300
Subject: [PATCH] --- yaml --- r: 98480 b: refs/heads/master c:
 a8a1f8cc0cae07c209f13857adbdd4b87b36cdde h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 3 +++
 trunk/drivers/media/video/em28xx/em28xx-reg.h   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5973199aafa4..6b078661d63a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df619181631217e3166bb6c7538f981e0272617f
+refs/heads/master: a8a1f8cc0cae07c209f13857adbdd4b87b36cdde
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 5cf71582e3a2..8cbda43727c3 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -525,6 +525,9 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 	rc = em28xx_read_reg(dev, EM28XX_R0A_CHIPID);
 	if (rc > 0) {
 		switch (rc) {
+		case CHIP_ID_EM2860:
+			em28xx_info("chip ID is em2860\n");
+			break;
 		case CHIP_ID_EM2883:
 			em28xx_info("chip ID is em2882/em2883\n");
 			dev->wait_after_write = 0;
diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h
index 9058bed07953..fac1ab23f621 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-reg.h
+++ b/trunk/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,
 };