diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/fb.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index ffac70aab3e9..70c4836e4a9f 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
| @@ -792,4 +792,16 @@ extern int fb_find_mode(struct fb_var_screeninfo *var, | |||
| 792 | const struct fb_videomode *default_mode, | 792 | const struct fb_videomode *default_mode, |
| 793 | unsigned int default_bpp); | 793 | unsigned int default_bpp); |
| 794 | 794 | ||
| 795 | /* Convenience logging macros */ | ||
| 796 | #define fb_err(fb_info, fmt, ...) \ | ||
| 797 | pr_err("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__) | ||
| 798 | #define fb_notice(info, fmt, ...) \ | ||
| 799 | pr_notice("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__) | ||
| 800 | #define fb_warn(fb_info, fmt, ...) \ | ||
| 801 | pr_warn("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__) | ||
| 802 | #define fb_info(fb_info, fmt, ...) \ | ||
| 803 | pr_info("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__) | ||
| 804 | #define fb_dbg(fb_info, fmt, ...) \ | ||
| 805 | pr_debug("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__) | ||
| 806 | |||
| 795 | #endif /* _LINUX_FB_H */ | 807 | #endif /* _LINUX_FB_H */ |