diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
commit | c30e05a83632aeb144f9d3912d39162564244a34 (patch) | |
tree | 9877e4ed4167591ccb709ffbee27d7766986dabb /linux/drivers/media/dvb/dvb-usb/dibusb-common.c | |
parent | ba8e7e903d8aaa290f8528c1beba1284c1d33ddf (diff) | |
parent | e2b3b766697ca509f1281178161156ab8df5b0d5 (diff) | |
download | mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.gz mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dibusb-common.c')
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index b95b1eb1e..8ee6cd4da 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -223,7 +223,9 @@ static struct dibx000_agc_config dib3000p_panasonic_agc_config = { .agc2_slope2 = 0x1e, }; -#ifdef CONFIG_DVB_DIB3000MC +#if defined(CONFIG_DVB_DIB3000MC) || \ + (defined(CONFIG_DVB_DIB3000MC_MODULE) && defined(MODULE)) + static struct dib3000mc_config mod3000p_dib3000p_config = { &dib3000p_panasonic_agc_config, |