diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 02:29:26 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 02:29:26 +0100 |
commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /drivers/isdn/hisax/isdnl1.h | |
parent | ARM: mach-shmobile: mackerel: Add HDMI sound support (diff) | |
parent | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.tar.xz linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.zip |
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/isdnl1.h')
-rw-r--r-- | drivers/isdn/hisax/isdnl1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hisax/isdnl1.h b/drivers/isdn/hisax/isdnl1.h index 172ad4c8c961..425d86116f2b 100644 --- a/drivers/isdn/hisax/isdnl1.h +++ b/drivers/isdn/hisax/isdnl1.h @@ -21,6 +21,7 @@ #define B_XMTBUFREADY 1 #define B_ACKPENDING 2 +__attribute__((format(printf, 2, 3))) void debugl1(struct IsdnCardState *cs, char *fmt, ...); void DChannel_proc_xmt(struct IsdnCardState *cs); void DChannel_proc_rcv(struct IsdnCardState *cs); |