From e375809073b8cd3fc0f9bc4f9065cffe7ccdbf9e Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 18 Jun 2009 05:20:51 -0300
Subject: [PATCH] --- yaml --- r: 153919 b: refs/heads/master c:
 119893b2dfb18515bfdcc5edb83422e6aa126a86 h: refs/heads/master i:   153917:
 3faf86301d221c140869281fb321cc59faf6cbba   153915:
 9c5fadbf650eb9872b4e15bcf73eeac6105fdd79   153911:
 59d16247ead0875ebc1c91e40a8913ad8be58631   153903:
 a5a969743b7dbca7b22eb8950ec08c12359f32a9   153887:
 61a167e21d893c62111a703a73e7238b7ff76cc4   153855:
 ec13d3593320ca67df43434f791b9ff2d76680e0 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/usbvideo/Kconfig | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89b31910997e..293296e5b199 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc7b5b573feb5edfe68c028bc1ea383dab37dde2
+refs/heads/master: 119893b2dfb18515bfdcc5edb83422e6aa126a86
diff --git a/trunk/drivers/media/video/usbvideo/Kconfig b/trunk/drivers/media/video/usbvideo/Kconfig
index e4cb99c1f94b..adb1c044ad7d 100644
--- a/trunk/drivers/media/video/usbvideo/Kconfig
+++ b/trunk/drivers/media/video/usbvideo/Kconfig
@@ -38,10 +38,13 @@ config USB_KONICAWC
 	  module will be called konicawc.
 
 config USB_QUICKCAM_MESSENGER
-	tristate "USB Logitech Quickcam Messenger"
+	tristate "USB Logitech Quickcam Messenger (DEPRECATED)"
 	depends on VIDEO_V4L1
 	select VIDEO_USBVIDEO
 	---help---
+	  This driver is DEPRECATED please use the gspca stv06xx module
+	  instead.
+
 	  Say Y or M here to enable support for the USB Logitech Quickcam
 	  Messenger webcam.