git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.3-rc1' into staging/for_v3.3
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
dvb
/
ddbridge
/
ddbridge-core.c
diff --git
a/drivers/media/dvb/ddbridge/ddbridge-core.c
b/drivers/media/dvb/ddbridge/ddbridge-core.c
index ce4f85849e7b1cc6114b05e1664dd2be71dc6e54..d88c4aa7d24dcbe70915a7c8be29c35cc0d6f62c 100644
(file)
--- a/
drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/
drivers/media/dvb/ddbridge/ddbridge-core.c
@@
-578,6
+578,7
@@
static int demod_attach_drxk(struct ddb_input *input)
struct drxk_config config;
memset(&config, 0, sizeof(config));
+ config.microcode_name = "drxk_a3.mc";
config.adr = 0x29 + (input->nr & 1);
fe = input->fe = dvb_attach(drxk_attach, &config, i2c);