diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-01-06 10:35:33 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-01-06 10:35:33 +0100 |
| commit | 22164fbe274c2dd96d2887fe121896d321000a61 (patch) | |
| tree | 629a8af05ecbe3ed8e18938de2564517c9b44d92 /include/linux/initrd.h | |
| parent | 3d0dad869aeb5d8e81985c73a6c73428258f8083 (diff) | |
| parent | f5c547efa16c0ea5abff0596e829f502be11902e (diff) | |
Merge drm/drm-next into drm-misc-next
Requested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/initrd.h')
| -rw-r--r-- | include/linux/initrd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/initrd.h b/include/linux/initrd.h index d77fe34fb00a..aa5914355728 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -28,3 +28,5 @@ extern unsigned int real_root_dev; extern char __initramfs_start[]; extern unsigned long __initramfs_size; + +void console_on_rootfs(void); |