Merge tag '4.16-minor-rc-SMB3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / media / pci / ivtv / ivtv-firmware.c

diff --git a/drivers/media/pci/ivtv/ivtv-firmware.c b/drivers/media/pci/ivtv/ivtv-firmware.c
index ba279fdb3df8c8f07f0b5b17a1f692f6e614da28..9f05472fca2087cc30cf9f06a2ba68fbe01040bb 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-firmware.c
+++ b/drivers/media/pci/ivtv/ivtv-firmware.c
@@ -28,26 +28,26 @@
 #include <linux/firmware.h>
 #include <media/i2c/saa7127.h>
 
-#define IVTV_MASK_SPU_ENABLE           0xFFFFFFFE
-#define IVTV_MASK_VPU_ENABLE15                 0xFFFFFFF6
-#define IVTV_MASK_VPU_ENABLE16                 0xFFFFFFFB
-#define IVTV_CMD_VDM_STOP              0x00000000
-#define IVTV_CMD_AO_STOP               0x00000005
-#define IVTV_CMD_APU_PING              0x00000000
-#define IVTV_CMD_VPU_STOP15            0xFFFFFFFE
-#define IVTV_CMD_VPU_STOP16            0xFFFFFFEE
-#define IVTV_CMD_HW_BLOCKS_RST                 0xFFFFFFFF
-#define IVTV_CMD_SPU_STOP              0x00000001
-#define IVTV_CMD_SDRAM_PRECHARGE_INIT  0x0000001A
-#define IVTV_CMD_SDRAM_REFRESH_INIT    0x80000640
-#define IVTV_SDRAM_SLEEPTIME           600
-
-#define IVTV_DECODE_INIT_MPEG_FILENAME         "v4l-cx2341x-init.mpg"
-#define IVTV_DECODE_INIT_MPEG_SIZE     (152*1024)
+#define IVTV_MASK_SPU_ENABLE           0xFFFFFFFE
+#define IVTV_MASK_VPU_ENABLE15         0xFFFFFFF6
+#define IVTV_MASK_VPU_ENABLE16         0xFFFFFFFB
+#define IVTV_CMD_VDM_STOP              0x00000000
+#define IVTV_CMD_AO_STOP               0x00000005
+#define IVTV_CMD_APU_PING              0x00000000
+#define IVTV_CMD_VPU_STOP15            0xFFFFFFFE
+#define IVTV_CMD_VPU_STOP16            0xFFFFFFEE
+#define IVTV_CMD_HW_BLOCKS_RST         0xFFFFFFFF
+#define IVTV_CMD_SPU_STOP              0x00000001
+#define IVTV_CMD_SDRAM_PRECHARGE_INIT  0x0000001A
+#define IVTV_CMD_SDRAM_REFRESH_INIT    0x80000640
+#define IVTV_SDRAM_SLEEPTIME           600
+
+#define IVTV_DECODE_INIT_MPEG_FILENAME "v4l-cx2341x-init.mpg"
+#define IVTV_DECODE_INIT_MPEG_SIZE     (152*1024)
 
 /* Encoder/decoder firmware sizes */
-#define IVTV_FW_ENC_SIZE               (376836)
-#define IVTV_FW_DEC_SIZE               (256*1024)
+#define IVTV_FW_ENC_SIZE               (376836)
+#define IVTV_FW_DEC_SIZE               (256*1024)
 
 static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv *itv, long size)
 {