git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
drivers
/
telephony
/
ixj.c
diff --git
a/drivers/telephony/ixj.c
b/drivers/telephony/ixj.c
index
b6cfcd2
..
1d0a2e1
100644
(file)
--- a/
drivers/telephony/ixj.c
+++ b/
drivers/telephony/ixj.c
@@
-7757,6
+7757,7
@@
int __init ixj_probe_isapnp(int *cnt)
}
j = ixj_alloc();
+ j->DSPbase = pnp_port_start(dev,0);
request_region(j->DSPbase, 16, "ixj DSP");
if (func != 0x110)