diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-06 16:45:46 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-06 16:45:46 -0500 |
| commit | d79ae6aa3087a6434b5ecdb51d20dca20c8e1596 (patch) | |
| tree | ef06de49134213591e529ece83d4cec3095e893e /include/linux/kernel.h | |
| parent | bead4f2f2c85e1bf39d2c80ef733f1325eb336bb (diff) | |
| parent | fb013eee68d08403572ef3c579f6688bbe33fd47 (diff) | |
| download | u-boot-d79ae6aa3087a6434b5ecdb51d20dca20c8e1596.tar.gz u-boot-d79ae6aa3087a6434b5ecdb51d20dca20c8e1596.tar.xz u-boot-d79ae6aa3087a6434b5ecdb51d20dca20c8e1596.zip | |
Merge branch '2019-12-06-master-imports'
- Allow for the sysboot command, which is used to parse extlinux.conf
files to be used without PXE support. There is no functional change
here aside from fixing distro boot in a few cases where we actually
lacked the ability to parse the extlinux.conf file
- Add the x509/pkcs7 parsers from Linux, a pre-requisite to EFI Secure
Boot support.
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5c7e5f635b..564819a1c0 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -1,8 +1,8 @@ #ifndef _LINUX_KERNEL_H #define _LINUX_KERNEL_H - #include <linux/types.h> +#include <linux/printk.h> /* for printf/pr_* utilities */ #define USHRT_MAX ((u16)(~0U)) #define SHRT_MAX ((s16)(USHRT_MAX>>1)) |