diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-07 17:20:55 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-07 17:20:55 +0000 |
| commit | a107ffe65b37a2bb7dfad1822910d281b18a2da9 (patch) | |
| tree | e442715132c886c5290dc14262614ba7978510c7 /linux/drivers | |
| parent | df494baee07b4aa44ff5f8791cd4b972e3c7c8c3 (diff) | |
| download | mediapointer-dvb-s2-a107ffe65b37a2bb7dfad1822910d281b18a2da9.tar.gz mediapointer-dvb-s2-a107ffe65b37a2bb7dfad1822910d281b18a2da9.tar.bz2 | |
small cleanups
- removed unneeded __stringify
- updated i2c-id.h
- kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/Kconfig | 15 |
3 files changed, 17 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 47b21f54d..39b90a055 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -61,7 +61,7 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); #define dprintk(level, args...) \ do { \ if ((debug & level)) { \ - printk("%s: %s(): ", __stringify(KBUILD_MODNAME), \ + printk("%s: %s(): ", KBUILD_MODNAME, \ __FUNCTION__); \ printk(args); } \ } while (0) diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h index fdaa3318a..c8d48cfba 100644 --- a/linux/drivers/media/dvb/ttpci/budget.h +++ b/linux/drivers/media/dvb/ttpci/budget.h @@ -19,7 +19,7 @@ extern int budget_debug; #endif #define dprintk(level,args...) \ - do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0) + do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0) struct budget_info { char *name; diff --git a/linux/drivers/media/video/cx88/Kconfig b/linux/drivers/media/video/cx88/Kconfig index ec6201a32..6c9cca69c 100644 --- a/linux/drivers/media/video/cx88/Kconfig +++ b/linux/drivers/media/video/cx88/Kconfig @@ -29,6 +29,21 @@ config VIDEO_CX88_DVB You must also select one or more DVB/ATSC demodulators. If you are unsure which you need, choose all of them. +config VIDEO_CX88_ALSA + tristate "ALSA DMA audio support" + depends on VIDEO_CX88_DVB && SND + select SND_PCM_OSS + ---help--- + This is a video4linux driver for direct (DMA) audio on + Conexant 2388x based TV cards. + It only works with boards with function 01 enabled. + To check if your board supports, use lspci -n. + If supported, you should see 1471:8801 or 1471:8811 + PCI device. + + To compile this driver as a module, choose M here: the + module will be called saa7134-alsa. + config VIDEO_CX88_DVB_ALL_FRONTENDS bool "Build all supported frontends for cx2388x based TV cards" default y |