From patchwork Thu May 26 07:58:23 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: 6747 Return-path: Envelope-to: mchehab@pedra Delivery-date: Thu, 26 May 2011 05:29:15 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1QPVwQ-0006bt-Ba for mchehab@pedra; Thu, 26 May 2011 05:29:14 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 26 May 2011 05:29:14 -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 1QPVU9-0001A6-In; Thu, 26 May 2011 08:00:01 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754488Ab1EZH7l (ORCPT + 1 other); Thu, 26 May 2011 03:59:41 -0400 Received: from mailfe06.c2i.net ([212.247.154.162]:56914 "EHLO swip.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752439Ab1EZH7k convert rfc822-to-8bit (ORCPT ); Thu, 26 May 2011 03:59:40 -0400 X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=NvrFngl24Vvwb7eBef0tfsytOWEnP/WlkqxQrRnklhk= c=1 sm=1 a=SvYTsOw2Z4kA:10 a=omd460kdGyMA:10 a=WQU8e4WWZSUA:10 a=kj9zAlcOel0A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=8kQB0OdkAAAA:8 a=zWFImrMh_A0N5ptZ3JQA:9 a=CjuIK1q_8ugA:10 a=9aOQ2cSd83gA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe06.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 130980087 for linux-media@vger.kernel.org; Thu, 26 May 2011 09:59:38 +0200 From: Hans Petter Selasky To: "linux-media@vger.kernel.org" Subject: [PATCH v2] Remove unused definitions which can cause conflict with definitions in usb/ch9.h. Date: Thu, 26 May 2011 09:58:23 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.2-STABLE; KDE/4.4.5; amd64; ; ) X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq,NwSZ4V" =?utf-8?q?=7CLR=2E+tj=7Dg5=0A=09=25V?=,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( =?utf-8?q?=0A=09=3AAuzV9=3A=2EhESm-x4h240C=609=3Dw?= MIME-Version: 1.0 Message-Id: <201105260958.23397.hselasky@c2i.net> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: From 0dd2949dfeae431ed4ffbd00fd14a10dc3747ad0 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Thu, 26 May 2011 09:56:55 +0200 Subject: [PATCH] Remove unused definitions which can cause conflict with definitions in usb/ch9.h. Signed-off-by: Hans Petter Selasky --- drivers/media/dvb/dvb-usb/gp8psk.h | 3 --- drivers/media/dvb/dvb-usb/vp7045.h | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/media/dvb/dvb-usb/gp8psk.h b/drivers/media/dvb/dvb-usb/gp8psk.h index 831749a..ed32b9d 100644 --- a/drivers/media/dvb/dvb-usb/gp8psk.h +++ b/drivers/media/dvb/dvb-usb/gp8psk.h @@ -78,9 +78,6 @@ 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 RESET_FX2 0x13 diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/dvb/dvb-usb/vp7045.h index 969688f..cf5ec46 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.h +++ b/drivers/media/dvb/dvb-usb/vp7045.h @@ -36,9 +36,6 @@ #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 LOCK_TUNER_COMMAND 0x09