diff options
author | Hans Petter Selasky <hselasky@c2i.net> | 2011-05-26 03:56:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:52:59 -0400 |
commit | ed5d11d592e21f00d6f72e1da0dca0ba3f4cd6ee (patch) | |
tree | 85fa8570c655a03110f4f32338b392399378d1c4 /drivers/media/dvb | |
parent | 2c7988ab0effa9e41bd9c9db5cb33ddda870ca10 (diff) |
[media] Remove unused definitions which can cause conflict with definitions in usb/ch9.h
>From 0dd2949dfeae431ed4ffbd00fd14a10dc3747ad0 Mon Sep 17 00:00:00 2001
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/gp8psk.h | 3 | ||||
-rw-r--r-- | 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 831749a518c..ed32b9da484 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; | |||
78 | #define ADV_MOD_DVB_BPSK 9 /* DVB-S BPSK */ | 78 | #define ADV_MOD_DVB_BPSK 9 /* DVB-S BPSK */ |
79 | 79 | ||
80 | #define GET_USB_SPEED 0x07 | 80 | #define GET_USB_SPEED 0x07 |
81 | #define USB_SPEED_LOW 0 | ||
82 | #define USB_SPEED_FULL 1 | ||
83 | #define USB_SPEED_HIGH 2 | ||
84 | 81 | ||
85 | #define RESET_FX2 0x13 | 82 | #define RESET_FX2 0x13 |
86 | 83 | ||
diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/dvb/dvb-usb/vp7045.h index 969688f8526..cf5ec46f8bb 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.h +++ b/drivers/media/dvb/dvb-usb/vp7045.h | |||
@@ -36,9 +36,6 @@ | |||
36 | #define Tuner_Power_OFF 0 | 36 | #define Tuner_Power_OFF 0 |
37 | 37 | ||
38 | #define GET_USB_SPEED 0x07 | 38 | #define GET_USB_SPEED 0x07 |
39 | #define USB_SPEED_LOW 0 | ||
40 | #define USB_SPEED_FULL 1 | ||
41 | #define USB_SPEED_HIGH 2 | ||
42 | 39 | ||
43 | #define LOCK_TUNER_COMMAND 0x09 | 40 | #define LOCK_TUNER_COMMAND 0x09 |
44 | 41 | ||