Automatic merge of /spare/repo/netdev-2.6 branch master

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/usb/media/pwc/pwc-uncompress.c b/drivers/usb/media/pwc/pwc-uncompress.c
index c062e43b3ac5..c596083f06ba 100644
--- a/drivers/usb/media/pwc/pwc-uncompress.c
+++ b/drivers/usb/media/pwc/pwc-uncompress.c
@@ -122,6 +122,7 @@ int pwc_decompress(struct pwc_device *pdev)
 
                 switch (pdev->type)
                  {
+#if 0            
                   case 675:
                   case 680:
                   case 690:
@@ -137,6 +138,7 @@ int pwc_decompress(struct pwc_device *pdev)
                   case 645:
                   case 646:
                     /* TODO & FIXME */
+#endif              
                     return -ENXIO; /* No such device or address: missing decompressor */
                     break;
                  }