Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317756
b: refs/heads/master
c: 599e6b2
h: refs/heads/master
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 91ea2e3 commit 2be2643
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aab048923955ca2fa050a06b5a54568b4e6c5f4c
refs/heads/master: 599e6b2e90b4c152a633a2bcd7c583b0dff9bf98
4 changes: 2 additions & 2 deletions trunk/drivers/staging/telephony/ixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -7094,7 +7094,7 @@ static int ixj_selfprobe(IXJ *j)
for (cnt = 0; cnt < 35; cnt++)
j->ixj_signals[cnt] = SIGIO;

/* Set the excetion signal enable flags */
/* Set the exception signal enable flags */
j->ex_sig.bits.dtmf_ready = j->ex_sig.bits.hookstate = j->ex_sig.bits.flash = j->ex_sig.bits.pstn_ring =
j->ex_sig.bits.caller_id = j->ex_sig.bits.pstn_wink = j->ex_sig.bits.f0 = j->ex_sig.bits.f1 = j->ex_sig.bits.f2 =
j->ex_sig.bits.f3 = j->ex_sig.bits.fc0 = j->ex_sig.bits.fc1 = j->ex_sig.bits.fc2 = j->ex_sig.bits.fc3 = 1;
Expand Down Expand Up @@ -7132,7 +7132,7 @@ IXJ *ixj_pcmcia_probe(unsigned long dsp, unsigned long xilinx)
return j;
}

EXPORT_SYMBOL(ixj_pcmcia_probe); /* Fpr PCMCIA */
EXPORT_SYMBOL(ixj_pcmcia_probe); /* For PCMCIA */

static int ixj_get_status_proc(char *buf)
{
Expand Down

0 comments on commit 2be2643

Please sign in to comment.