diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 17:11:03 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 17:11:03 -0400 |
commit | 8b0ee07e108b2eefdab5bb73f33223f18926c3b2 (patch) | |
tree | f68ca04180c5488301a40ec212ef2eb2467cf56c /drivers/isdn/i4l/isdn_ttyfax.c | |
parent | 4638aef40ba9ebb9734caeed1f373c24015259fd (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
Diffstat (limited to 'drivers/isdn/i4l/isdn_ttyfax.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_ttyfax.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c index ce2c3ef92e46..a943d078bacc 100644 --- a/drivers/isdn/i4l/isdn_ttyfax.c +++ b/drivers/isdn/i4l/isdn_ttyfax.c @@ -148,7 +148,7 @@ isdn_tty_fax_modem_result(int code, modem_info * info) } } -int +static int isdn_tty_fax_command1(modem_info * info, isdn_ctrl * c) { static char *msg[] = @@ -316,7 +316,7 @@ isdn_tty_fax_bitorder(modem_info * info, struct sk_buff *skb) * Parse AT+F.. FAX class 1 commands */ -int +static int isdn_tty_cmd_FCLASS1(char **p, modem_info * info) { static char *cmd[] = @@ -408,7 +408,7 @@ isdn_tty_cmd_FCLASS1(char **p, modem_info * info) * Parse AT+F.. FAX class 2 commands */ -int +static int isdn_tty_cmd_FCLASS2(char **p, modem_info * info) { atemu *m = &info->emu; |