Merge commit 'v2.6.35-rc3' into for-linus

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index e5b9594eb5f6..273c8d4b3853 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -177,6 +177,11 @@ struct pvr2_device_desc {
         unsigned int flag_has_composite:1;     /* Has composite input */
         unsigned int flag_has_svideo:1;        /* Has s-video input */
         unsigned int flag_fx2_16kb:1;          /* 16KB FX2 firmware OK here */
+
+        /* If this driver is considered experimental, i.e. not all aspects
+           are working correctly and/or it is untested, mark that fact
+           with this flag. */
+        unsigned int flag_is_experimental:1;
 };
 
 extern struct usb_device_id pvr2_device_table[];