hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB (13039): dib0700: not building CONFIG_DVB_TUNER_DIB0070 breaks compilation
  V4L/DVB (13038): dvbdev: Remove an anoying/uneeded warning
  V4L/DVB (13037): go7007: Revert compatibility code added at the wrong place
  media: video: Fix build in saa7164
This commit is contained in:
Linus Torvalds 2009-09-24 07:54:16 -07:00
parent db16826367 3f48258e50
commit 9f6ac7850a
7 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/dvb/dvb-core/dvbdev.h
View File

@ -31,10 +31,9 @@
#define DVB_MAJOR 212 #define DVB_MAJOR 212
#if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0 #if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0
#define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS #define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS
#else #else
#warning invalid CONFIG_DVB_MAX_ADAPTERS value #define DVB_MAX_ADAPTERS 8
#define DVB_MAX_ADAPTERS 8
#endif #endif
#define DVB_UNSET (-1) #define DVB_UNSET (-1)

2
drivers/media/dvb/dvb-usb/Kconfig
View File

@ -75,7 +75,7 @@ config DVB_USB_DIB0700
select DVB_DIB3000MC if !DVB_FE_CUSTOMISE select DVB_DIB3000MC if !DVB_FE_CUSTOMISE
select DVB_S5H1411 if !DVB_FE_CUSTOMISE select DVB_S5H1411 if !DVB_FE_CUSTOMISE
select DVB_LGDT3305 if !DVB_FE_CUSTOMISE select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE select DVB_TUNER_DIB0070
select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE
select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE

8
drivers/media/video/saa7164/saa7164-api.c
View File

@ -415,7 +415,7 @@ int saa7164_api_enum_subdevs(struct saa7164_dev *dev)
goto out; goto out;
} }
if (debug & DBGLVL_API) if (saa_debug & DBGLVL_API)
saa7164_dumphex16(dev, buf, (buflen/16)*16); saa7164_dumphex16(dev, buf, (buflen/16)*16);
saa7164_api_dump_subdevs(dev, buf, buflen); saa7164_api_dump_subdevs(dev, buf, buflen);
@ -480,7 +480,7 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,
dprintk(DBGLVL_API, "%s() len = %d bytes\n", __func__, len); dprintk(DBGLVL_API, "%s() len = %d bytes\n", __func__, len);
if (debug & DBGLVL_I2C) if (saa_debug & DBGLVL_I2C)
saa7164_dumphex16(dev, buf, 2 * 16); saa7164_dumphex16(dev, buf, 2 * 16);
ret = saa7164_cmd_send(bus->dev, unitid, GET_CUR, ret = saa7164_cmd_send(bus->dev, unitid, GET_CUR,
@ -488,7 +488,7 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,
if (ret != SAA_OK) if (ret != SAA_OK)
printk(KERN_ERR "%s() error, ret(2) = 0x%x\n", __func__, ret); printk(KERN_ERR "%s() error, ret(2) = 0x%x\n", __func__, ret);
else { else {
if (debug & DBGLVL_I2C) if (saa_debug & DBGLVL_I2C)
saa7164_dumphex16(dev, buf, sizeof(buf)); saa7164_dumphex16(dev, buf, sizeof(buf));
memcpy(data, (buf + 2 * sizeof(u32) + reglen), datalen); memcpy(data, (buf + 2 * sizeof(u32) + reglen), datalen);
} }
@ -548,7 +548,7 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen,
*((u32 *)(buf + 1 * sizeof(u32))) = datalen - reglen; *((u32 *)(buf + 1 * sizeof(u32))) = datalen - reglen;
memcpy((buf + 2 * sizeof(u32)), data, datalen); memcpy((buf + 2 * sizeof(u32)), data, datalen);
if (debug & DBGLVL_I2C) if (saa_debug & DBGLVL_I2C)
saa7164_dumphex16(dev, buf, sizeof(buf)); saa7164_dumphex16(dev, buf, sizeof(buf));
ret = saa7164_cmd_send(bus->dev, unitid, SET_CUR, ret = saa7164_cmd_send(bus->dev, unitid, SET_CUR,

2
drivers/media/video/saa7164/saa7164-cmd.c
View File

@ -250,7 +250,7 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
unsigned long stamp; unsigned long stamp;
int r; int r;
if (debug >= 4) if (saa_debug >= 4)
saa7164_bus_dump(dev); saa7164_bus_dump(dev);
dprintk(DBGLVL_CMD, "%s(seqno=%d)\n", __func__, seqno); dprintk(DBGLVL_CMD, "%s(seqno=%d)\n", __func__, seqno);

6
drivers/media/video/saa7164/saa7164-core.c
View File

@ -45,8 +45,8 @@ MODULE_LICENSE("GPL");
32 bus 32 bus
*/ */
unsigned int debug; unsigned int saa_debug;
module_param(debug, int, 0644); module_param_named(debug, saa_debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages"); MODULE_PARM_DESC(debug, "enable debug messages");
unsigned int waitsecs = 10; unsigned int waitsecs = 10;
@ -653,7 +653,7 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
printk(KERN_ERR "%s() Unsupported board detected, " printk(KERN_ERR "%s() Unsupported board detected, "
"registering without firmware\n", __func__); "registering without firmware\n", __func__);
dprintk(1, "%s() parameter debug = %d\n", __func__, debug); dprintk(1, "%s() parameter debug = %d\n", __func__, saa_debug);
dprintk(1, "%s() parameter waitsecs = %d\n", __func__, waitsecs); dprintk(1, "%s() parameter waitsecs = %d\n", __func__, waitsecs);
fail_fw: fail_fw:

4
drivers/media/video/saa7164/saa7164.h
View File

@ -375,9 +375,9 @@ extern int saa7164_buffer_dealloc(struct saa7164_tsport *port,
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
extern unsigned int debug; extern unsigned int saa_debug;
#define dprintk(level, fmt, arg...)\ #define dprintk(level, fmt, arg...)\
do { if (debug & level)\ do { if (saa_debug & level)\
printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg);\ printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg);\
} while (0) } while (0)

5
drivers/staging/go7007/Makefile
View File

@ -32,8 +32,3 @@ endif
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
# Ubuntu 8.04 has CONFIG_SND undefined, so include lum sound/config.h too
ifeq ($(CONFIG_SND),)
EXTRA_CFLAGS += -include sound/config.h
endif