diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-11-03 23:32:20 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-11-03 23:32:20 -0400 |
| commit | 3983138c017b6aeab6ce3dbb1e9afbe80bdac496 (patch) | |
| tree | 9fdcddfdb8ada91504c90e2551ba6a565ade7325 /sound | |
| parent | ed5f886d16369fed5a69d96b8e85777c47206de1 (diff) | |
| parent | 02aac316abf436a7529d46a71f7083f9f9ef4b49 (diff) | |
Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/cmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c index 14cacbc655dd..76294f2ae47f 100644 --- a/sound/firewire/cmp.c +++ b/sound/firewire/cmp.c | |||
| @@ -32,7 +32,7 @@ enum bus_reset_handling { | |||
| 32 | SUCCEED_ON_BUS_RESET, | 32 | SUCCEED_ON_BUS_RESET, |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | static __attribute__((format(printf, 2, 3))) | 35 | static __printf(2, 3) |
| 36 | void cmp_error(struct cmp_connection *c, const char *fmt, ...) | 36 | void cmp_error(struct cmp_connection *c, const char *fmt, ...) |
| 37 | { | 37 | { |
| 38 | va_list va; | 38 | va_list va; |