diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /include/linux/printk.h | |
| parent | d752b2696072ed52fd5afab08b601e2220a3b87e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
Merge tag 'v3.10-rc7' into for-3.11/drivers
Linux 3.10-rc7
Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.
Diffstat (limited to 'include/linux/printk.h')
| -rw-r--r-- | include/linux/printk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 6af944ab38f0..22c7052e9372 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <stdarg.h> | 4 | #include <stdarg.h> |
| 5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 6 | #include <linux/kern_levels.h> | 6 | #include <linux/kern_levels.h> |
| 7 | #include <linux/linkage.h> | ||
| 7 | 8 | ||
| 8 | extern const char linux_banner[]; | 9 | extern const char linux_banner[]; |
| 9 | extern const char linux_proc_banner[]; | 10 | extern const char linux_proc_banner[]; |