Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bd16024 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover-fixup' of... 

Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover-fixup' of https://github.com/bzolnier/linux

 into drm-misc-next

Immutable branch between fbdev and drm for the v4.19 merge window
(contains build fixup for the deferred console takeover feature)

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>

# gpg: Signature made Fri 29 Jun 2018 06:47:23 AM -03
# gpg:                using RSA key 7E33B63FA047C20B
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/3340294.YySDL1Tsl7@amdc3058
parents c981c011 334bb897

drivers/video/console/dummycon.c

+2 −0
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ void dummycon_register_output_notifier(struct notifier_block *nb) 
	if (dummycon_putc_called)

		nb->notifier_call(nb, 0, NULL);

}

EXPORT_SYMBOL_GPL(dummycon_register_output_notifier);



void dummycon_unregister_output_notifier(struct notifier_block *nb)

{

	raw_notifier_chain_unregister(&dummycon_output_nh, nb);

}

EXPORT_SYMBOL_GPL(dummycon_unregister_output_notifier);



static void dummycon_putc(struct vc_data *vc, int c, int ypos, int xpos)

{