Skip to content

Commit

Permalink
Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover-fixup' of htt…
Browse files Browse the repository at this point in the history
…ps://github.com/bzolnier/linux into fbdev-for-next

Immutable branch between fbdev and drm for the v4.19 merge window
(contains build fixup for the deferred console takeover feature)
  • Loading branch information
bzolnier committed Jun 29, 2018
2 parents d725d6e + 334bb89 commit 13d7f93
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/video/console/dummycon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 13d7f93

Please sign in to comment.