From patchwork Thu Jul 8 04:46:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Justin P. Mattock" X-Patchwork-Id: 3746 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Thu, 08 Jul 2010 04:46:29 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 08 Jul 2010 09:37:35 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OWj0G-00030i-Rx; Thu, 08 Jul 2010 04:46:29 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457Ab0GHEqH (ORCPT + 1 other); Thu, 8 Jul 2010 00:46:07 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:40300 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750771Ab0GHEqE (ORCPT ); Thu, 8 Jul 2010 00:46:04 -0400 Received: by pxi14 with SMTP id 14so161588pxi.19 for ; Wed, 07 Jul 2010 21:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=uweN9SOp19HRHK/808D3AJtfHasNnH6J4jxdyJZ+4Co=; b=XOxWXjMFdGBouj2wo6Gxj9El1/Qc4o7RIQnSoE5Z97zHQqVm8ymEPYfzPc49bM8Y4K QOYT3xwiwaaFkggkfLZ2miF3t3oJ+Gt12wfC96SAQaFFfMT7+kOBTonAGlXC9Ur7iqm3 9nYLFnZeYY6FJ9bA7AuIfiSVW7h5dDZx+vUQc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=MmjbPIgFEGiSgm1itIOKTwUCukAQUA2xReZQUdC+IkFLHPTq3OjiKT3SpApmP2BFHo WfaY8vDc26TAyhqFXBBUhq5gRko4ILtwdWMwgN9irJ+kaL5Mywnt1GJkSVx1gF9DACE8 7rV8AQqY/i7023HsEndw6ikR9wXXUwbvjPxRk= Received: by 10.142.172.15 with SMTP id u15mr9055617wfe.53.1278564363133; Wed, 07 Jul 2010 21:46:03 -0700 (PDT) Received: from localhost.localdomain ([76.91.45.220]) by mx.google.com with ESMTPS id c15sm8036146rvi.23.2010.07.07.21.46.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Jul 2010 21:46:01 -0700 (PDT) From: "Justin P. Mattock" To: linux-media@vger.kernel.org Cc: moinejf@free.fr, mchehab@infradead.org, linux-kernel@vger.kernel.org, "Justin P. Mattock" Subject: [PATCH]video:gspca.c Fix warning: case value '7' not in enumerated type 'enum v4l2_memory' Date: Wed, 7 Jul 2010 21:46:18 -0700 Message-Id: <1278564378-19855-1-git-send-email-justinmattock@gmail.com> X-Mailer: git-send-email 1.7.1.rc1.21.gf3bd6 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This fixes a warning I'm seeing when building: CC [M] drivers/media/video/gspca/gspca.o drivers/media/video/gspca/gspca.c: In function 'vidioc_reqbufs': drivers/media/video/gspca/gspca.c:1508:2: warning: case value '7' not in enumerated type 'enum v4l2_memory' Signed-off-by: Justin P. Mattock --- drivers/media/video/gspca/gspca.c | 1 - include/linux/videodev2.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 678675b..a9b4d97 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -84,7 +84,6 @@ static void PDEBUG_MODE(char *txt, __u32 pixfmt, int w, int h) /* specific memory types - !! should be different from V4L2_MEMORY_xxx */ #define GSPCA_MEMORY_NO 0 /* V4L2_MEMORY_xxx starts from 1 */ -#define GSPCA_MEMORY_READ 7 #define BUF_ALL_FLAGS (V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE) diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 047f7e6..b73aa18 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -170,6 +170,7 @@ enum v4l2_memory { V4L2_MEMORY_MMAP = 1, V4L2_MEMORY_USERPTR = 2, V4L2_MEMORY_OVERLAY = 3, + GSPCA_MEMORY_READ = 7, }; /* see also http://vektor.theorem.ca/graphics/ycbcr/ */