Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h

1 files changed, 3 insertions, 0 deletions

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 94e908c0d7a0..cf16689adba7 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -135,6 +135,9 @@ enum {
         /* module adv7175: just ident 7175 */
         V4L2_IDENT_ADV7175 = 7175,
 
+        /* module adv7180: just ident 7180 */
+        V4L2_IDENT_ADV7180 = 7180,
+
         /* module saa7185: just ident 7185 */
         V4L2_IDENT_SAA7185 = 7185,