diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 04:29:26 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 04:29:26 +0300 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /drivers/isdn/hisax/hisax.h | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 (diff) | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
| download | linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/isdn/hisax/hisax.h')
| -rw-r--r-- | drivers/isdn/hisax/hisax.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 32ab3924aa73..de1c669c7b13 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1286,7 +1286,9 @@ int jiftime(char *s, long mark); int HiSax_command(isdn_ctrl * ic); int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb); +__attribute__((format(printf, 3, 4))) void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...); +__attribute__((format(printf, 3, 0))) void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args); void HiSax_reportcard(int cardnr, int sel); int QuickHex(char *txt, u_char * p, int cnt); |