1 files changed, 1 insertions, 73 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 3ed4703956d3..f7849f852e9d 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -74,61 +74,10 @@
 #define IVTV_REG_OFFSET         0x02000000
 #define IVTV_REG_SIZE           0x00010000
 
-/* Buffers on hardware offsets */
-#define IVTV_YUV_BUFFER_OFFSET    0x001a8600    /* First YUV Buffer */
-#define IVTV_YUV_BUFFER_OFFSET_1  0x00240400    /* Second YUV Buffer */
-#define IVTV_YUV_BUFFER_OFFSET_2  0x002d8200    /* Third YUV Buffer */
-#define IVTV_YUV_BUFFER_OFFSET_3  0x00370000    /* Fourth YUV Buffer */
-#define IVTV_YUV_BUFFER_UV_OFFSET 0x65400       /* Offset to UV Buffer */
-
-/* Offset to filter table in firmware */
-#define IVTV_YUV_HORIZONTAL_FILTER_OFFSET 0x025d8
-#define IVTV_YUV_VERTICAL_FILTER_OFFSET 0x03358
-
-extern const u32 yuv_offset[4];
-
 /* Maximum ivtv driver instances. Some people have a huge number of
    capture cards, so set this to a high value. */
 #define IVTV_MAX_CARDS 32
 
-/* Supported cards */
-#define IVTV_CARD_PVR_250             0 /* WinTV PVR 250 */
-#define IVTV_CARD_PVR_350             1 /* encoder, decoder, tv-out */
-#define IVTV_CARD_PVR_150             2 /* WinTV PVR 150 and PVR 500 (really just two
-                                           PVR150s on one PCI board) */
-#define IVTV_CARD_M179                3 /* AVerMedia M179 (encoder only) */
-#define IVTV_CARD_MPG600              4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */
-#define IVTV_CARD_MPG160              5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG160
-                                           cx23415 based, but does not have tv-out */
-#define IVTV_CARD_PG600               6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */
-#define IVTV_CARD_AVC2410             7 /* Adaptec AVC-2410 */
-#define IVTV_CARD_AVC2010             8 /* Adaptec AVD-2010 (No Tuner) */
-#define IVTV_CARD_TG5000TV            9 /* NAGASE TRANSGEAR 5000TV, encoder only */
-#define IVTV_CARD_VA2000MAX_SNT6     10 /* VA2000MAX-STN6 */
-#define IVTV_CARD_CX23416GYC         11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */
-#define IVTV_CARD_GV_MVPRX           12 /* I/O Data GV-MVP/RX, RX2, RX2W */
-#define IVTV_CARD_GV_MVPRX2E         13 /* I/O Data GV-MVP/RX2E */
-#define IVTV_CARD_GOTVIEW_PCI_DVD    14 /* GotView PCI DVD */
-#define IVTV_CARD_GOTVIEW_PCI_DVD2   15 /* GotView PCI DVD2 */
-#define IVTV_CARD_YUAN_MPC622        16 /* Yuan MPC622 miniPCI */
-#define IVTV_CARD_DCTMTVP1           17 /* DIGITAL COWBOY DCT-MTVP1 */
-#define IVTV_CARD_PG600V2            18 /* Yuan PG600V2/GotView PCI DVD Lite */
-#define IVTV_CARD_CLUB3D             19 /* Club3D ZAP-TV1x01 */
-#define IVTV_CARD_AVERTV_MCE116      20 /* AVerTV MCE 116 Plus */
-#define IVTV_CARD_LAST               20
-
-/* Variants of existing cards but with the same PCI IDs. The driver
-   detects these based on other device information.
-   These cards must always come last.
-   New cards must be inserted above, and the indices of the cards below
-   must be adjusted accordingly. */
-
-/* PVR-350 V1 (uses saa7114) */
-#define IVTV_CARD_PVR_350_V1         (IVTV_CARD_LAST+1)
-/* 2 variants of Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */
-#define IVTV_CARD_CX23416GYC_NOGR    (IVTV_CARD_LAST+2)
-#define IVTV_CARD_CX23416GYC_NOGRYCS (IVTV_CARD_LAST+3)
-
 #define IVTV_ENC_STREAM_TYPE_MPG  0
 #define IVTV_ENC_STREAM_TYPE_YUV  1
 #define IVTV_ENC_STREAM_TYPE_VBI  2
@@ -150,27 +99,6 @@ extern const u32 yuv_offset[4];
 #define IVTV_ENC_MEM_START 0x00000000
 #define IVTV_DEC_MEM_START 0x01000000
 
-/* system vendor and device IDs */
-#define PCI_VENDOR_ID_ICOMP  0x4444
-#define PCI_DEVICE_ID_IVTV15 0x0803
-#define PCI_DEVICE_ID_IVTV16 0x0016
-
-/* subsystem vendor ID */
-#define IVTV_PCI_ID_HAUPPAUGE           0x0070
-#define IVTV_PCI_ID_HAUPPAUGE_ALT1      0x0270
-#define IVTV_PCI_ID_HAUPPAUGE_ALT2      0x4070
-#define IVTV_PCI_ID_ADAPTEC             0x9005
-#define IVTV_PCI_ID_AVERMEDIA           0x1461
-#define IVTV_PCI_ID_YUAN1               0x12ab
-#define IVTV_PCI_ID_YUAN2               0xff01
-#define IVTV_PCI_ID_YUAN3               0xffab
-#define IVTV_PCI_ID_YUAN4               0xfbab
-#define IVTV_PCI_ID_DIAMONDMM           0xff92
-#define IVTV_PCI_ID_IODATA              0x10fc
-#define IVTV_PCI_ID_MELCO               0x1154
-#define IVTV_PCI_ID_GOTVIEW1            0xffac
-#define IVTV_PCI_ID_GOTVIEW2            0xffad
-
 /* Decoder Buffer hardware size on Chip */
 #define IVTV_DEC_MAX_BUF        0x00100000      /* max bytes in decoder buffer */
 #define IVTV_DEC_MIN_BUF        0x00010000      /* min bytes in dec buffer */
@@ -890,4 +818,4 @@ int ivtv_init_on_first_open(struct ivtv *itv);
 #define write_dec_sync(val, addr) \
         do { write_dec(val, addr); read_dec(addr); } while (0)
 
-#endif /* IVTV_DRIVER_H */
+#endif