Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (3546): Fix Compilation after moving bttv code

- Missing a Makefile for bt8xx
- rds.h were at wrong directory, since it is a global header for an internal
interface
- tda7432 and tda9875 were dependent from bttv.h
- bttv.h were holding i2c addresses

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

+49 -29
+12
drivers/media/video/bt8xx/Makefile
··· 1 + # 2 + # Makefile for the video capture/playback device drivers. 3 + # 4 + 5 + bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ 6 + bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \ 7 + bttv-input.o 8 + 9 + obj-$(CONFIG_VIDEO_BT848) += bttv.o 10 + 11 + EXTRA_CFLAGS += -I$(src)/.. 12 + EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
+1 -1
drivers/media/video/bt8xx/bttv-driver.c
··· 42 42 #include <asm/io.h> 43 43 #include <asm/byteorder.h> 44 44 45 - #include "rds.h" 45 + #include <media/rds.h> 46 46 47 47 48 48 unsigned int bttv_num; /* number of Bt848s in use */
+1 -19
drivers/media/video/bt8xx/bttv.h
··· 18 18 #include <linux/i2c.h> 19 19 #include <media/ir-common.h> 20 20 #include <media/ir-kbd-i2c.h> 21 + #include <media/i2c-addr.h> 21 22 22 23 /* ---------------------------------------------------------- */ 23 24 /* exported by bttv-cards.c */ ··· 168 167 #define BTTV_BOARD_SABRENT_TVFM 0x8e 169 168 #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f 170 169 #define BTTV_BOARD_MACHTV_MAGICTV 0x90 171 - 172 - /* i2c address list */ 173 - #define I2C_TSA5522 0xc2 174 - #define I2C_TDA7432 0x8a 175 - #define I2C_BT832_ALT1 0x88 176 - #define I2C_BT832_ALT2 0x8a // alternate setting 177 - #define I2C_TDA8425 0x82 178 - #define I2C_TDA9840 0x84 179 - #define I2C_TDA9850 0xb6 /* also used by 9855,9873 */ 180 - #define I2C_TDA9874 0xb0 /* also used by 9875 */ 181 - #define I2C_TDA9875 0xb0 182 - #define I2C_HAUPEE 0xa0 183 - #define I2C_STBEE 0xae 184 - #define I2C_VHX 0xc0 185 - #define I2C_MSP3400 0x80 186 - #define I2C_MSP3400_ALT 0x88 187 - #define I2C_TEA6300 0x80 /* also used by 6320 */ 188 - #define I2C_DPL3518 0x84 189 - #define I2C_TDA9887 0x86 190 170 191 171 /* more card-specific defines */ 192 172 #define PT2254_L_CHANNEL 0x10
-4
drivers/media/video/rds.h include/media/rds.h
··· 42 42 #define RDS_CMD_POLL _IOR('R',4,int) 43 43 44 44 #endif 45 - 46 - 47 - 48 -
+1 -1
drivers/media/video/saa6588.c
··· 32 32 #include <asm/uaccess.h> 33 33 34 34 35 - #include "rds.h" 35 + #include <media/rds.h> 36 36 37 37 /* Addresses to scan */ 38 38 static unsigned short normal_i2c[] = {
+1 -1
drivers/media/video/saa7134/saa7134-core.c
··· 960 960 if (saa7134_no_overlay <= 0) { 961 961 saa7134_video_template.type |= VID_TYPE_OVERLAY; 962 962 } else { 963 - printk("bttv: Overlay support disabled.\n"); 963 + printk("%s: Overlay support disabled.\n",dev->name); 964 964 } 965 965 dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); 966 966 err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
+1 -1
drivers/media/video/tda7432.c
··· 48 48 #include <linux/i2c.h> 49 49 #include <linux/i2c-algo-bit.h> 50 50 51 - #include "bttv.h" 52 51 #include <media/audiochip.h> 53 52 #include <media/v4l2-common.h> 53 + #include <media/i2c-addr.h> 54 54 55 55 #ifndef VIDEO_AUDIO_BALANCE 56 56 # define VIDEO_AUDIO_BALANCE 32
+2 -2
drivers/media/video/tda9875.c
··· 30 30 #include <linux/i2c-algo-bit.h> 31 31 #include <linux/init.h> 32 32 33 - #include "bttv.h" 34 33 #include <media/audiochip.h> 34 + 35 + #include <media/i2c-addr.h> 35 36 36 37 static int debug; /* insmod parameter */ 37 38 module_param(debug, int, S_IRUGO | S_IWUSR); 38 39 MODULE_LICENSE("GPL"); 39 - 40 40 41 41 /* Addresses to scan */ 42 42 static unsigned short normal_i2c[] = {
+30
include/media/i2c-addr.h
··· 1 + /* 2 + * V4L I2C address list 3 + * 4 + * 5 + * Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org> 6 + * Based on a previous mapping by 7 + * Ralph Metzler (rjkm@thp.uni-koeln.de) 8 + * Gerd Knorr <kraxel@goldbach.in-berlin.de> 9 + * 10 + */ 11 + 12 + /* bttv address list */ 13 + #define I2C_TSA5522 0xc2 14 + #define I2C_TDA7432 0x8a 15 + #define I2C_BT832_ALT1 0x88 16 + #define I2C_BT832_ALT2 0x8a // alternate setting 17 + #define I2C_TDA8425 0x82 18 + #define I2C_TDA9840 0x84 19 + #define I2C_TDA9850 0xb6 /* also used by 9855,9873 */ 20 + #define I2C_TDA9874 0xb0 /* also used by 9875 */ 21 + #define I2C_TDA9875 0xb0 22 + #define I2C_HAUPEE 0xa0 23 + #define I2C_STBEE 0xae 24 + #define I2C_VHX 0xc0 25 + #define I2C_MSP3400 0x80 26 + #define I2C_MSP3400_ALT 0x88 27 + #define I2C_TEA6300 0x80 /* also used by 6320 */ 28 + #define I2C_DPL3518 0x84 29 + #define I2C_TDA9887 0x86 30 +