From patchwork Mon May 23 11:19:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Petter Selasky X-Patchwork-Id: 7171 Return-path: Envelope-to: mchehab@pedra Delivery-date: Mon, 23 May 2011 08:21:06 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1QOTC5-0007Eh-Sc for mchehab@pedra; Mon, 23 May 2011 08:21:06 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Mon, 23 May 2011 08:21:05 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QOTBh-0000ND-F5; Mon, 23 May 2011 11:20:41 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752243Ab1EWLUY (ORCPT + 1 other); Mon, 23 May 2011 07:20:24 -0400 Received: from mailfe08.c2i.net ([212.247.154.226]:52089 "EHLO swip.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752229Ab1EWLUY (ORCPT ); Mon, 23 May 2011 07:20:24 -0400 X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=6QwXiDozn7Gnsf2tGidwH+ndAwLlGixx7JAIKZICKmI= c=1 sm=1 a=WiVpEg-DfEgA:10 a=WQU8e4WWZSUA:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=SObZXD9RMCsnjX8LmoMA:9 a=CjuIK1q_8ugA:10 a=8kQB0OdkAAAA:8 a=bMueuSWozg6Xp1SmNL4A:9 a=9aOQ2cSd83gA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe08.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 130346878; Mon, 23 May 2011 13:20:22 +0200 To: "linux-media@vger.kernel.org" Subject: [PATCH] The USB_SPEED... keywords are already defined by the USB stack. Rename currently unused macros to avoid possible future warnings and errors. Cc: Mauro Carvalho Chehab From: Hans Petter Selasky X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq,NwSZ4V" =?iso-8859-15?q?=7CLR=2E+tj=7Dg5=0A=09=25V?=,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( =?iso-8859-15?q?=0A=09=3AAuzV9=3A=2EhESm-x4h240C=609=3Dw?= Date: Mon, 23 May 2011 13:19:11 +0200 MIME-Version: 1.0 Message-Id: <201105231319.11284.hselasky@c2i.net> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: --HPS From f7a0f7254da47ff88f69314f14043b01ba0764eb Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Mon, 23 May 2011 12:43:50 +0200 Subject: [PATCH] The USB_SPEED_XXX keywords are already defined by the USB stack. Rename currently unused macros to avoid possible future warnings and errors. Signed-off-by: Hans Petter Selasky --- drivers/media/dvb/dvb-usb/gp8psk.h | 6 +++--- drivers/media/dvb/dvb-usb/vp7045.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/dvb/dvb-usb/gp8psk.h b/drivers/media/dvb/dvb-usb/gp8psk.h index 831749a..c271b68 100644 --- a/drivers/media/dvb/dvb-usb/gp8psk.h +++ b/drivers/media/dvb/dvb-usb/gp8psk.h @@ -78,9 +78,9 @@ extern int dvb_usb_gp8psk_debug; #define ADV_MOD_DVB_BPSK 9 /* DVB-S BPSK */ #define GET_USB_SPEED 0x07 - #define USB_SPEED_LOW 0 - #define USB_SPEED_FULL 1 - #define USB_SPEED_HIGH 2 + #define TH_USB_SPEED_LOW 0 + #define TH_USB_SPEED_FULL 1 + #define TH_USB_SPEED_HIGH 2 #define RESET_FX2 0x13 diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/dvb/dvb-usb/vp7045.h index 969688f..7ce6c00 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.h +++ b/drivers/media/dvb/dvb-usb/vp7045.h @@ -36,9 +36,9 @@ #define Tuner_Power_OFF 0 #define GET_USB_SPEED 0x07 - #define USB_SPEED_LOW 0 - #define USB_SPEED_FULL 1 - #define USB_SPEED_HIGH 2 + #define TH_USB_SPEED_LOW 0 + #define TH_USB_SPEED_FULL 1 + #define TH_USB_SPEED_HIGH 2 #define LOCK_TUNER_COMMAND 0x09 -- 1.7.1.1