diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-07 18:48:45 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-07 18:48:45 -0200 |
commit | 1c0e6e2a91a24a057e1fa87365cfb20720a551ab (patch) | |
tree | fe425f255e589fb5b055f5b06326ba8c7209bfe1 /linux/drivers/media/dvb | |
parent | e2714f1e7d649366a168ab30f5fd97dfe5a477e6 (diff) | |
parent | 548e138c20f2155b8ffecde6bddcc2d591f1688f (diff) | |
download | mediapointer-dvb-s2-1c0e6e2a91a24a057e1fa87365cfb20720a551ab.tar.gz mediapointer-dvb-s2-1c0e6e2a91a24a057e1fa87365cfb20720a551ab.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index 9a184da01..b95b1eb1e 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -223,6 +223,7 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = { .agc2_slope2 = 0x1e, }; +#ifdef CONFIG_DVB_DIB3000MC static struct dib3000mc_config mod3000p_dib3000p_config = { &dib3000p_panasonic_agc_config, @@ -305,6 +306,7 @@ int dibusb_dib3000mc_tuner_attach(struct dvb_usb_adapter *adap) return 0; } EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach); +#endif /* * common remote control stuff |