diff --git a/[refs] b/[refs] index f51031c93145..eb4b3ffc232e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98840f2ce5339d46e1830b0455360ad03a840d9d +refs/heads/master: 6d6c971778c5257fc815e1ebe01779fefda6293c diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c index 59d7d5ec17a4..74e96cf83b7e 100644 --- a/trunk/drivers/video/console/vgacon.c +++ b/trunk/drivers/video/console/vgacon.c @@ -180,7 +180,6 @@ static inline void vga_set_mem_top(struct vc_data *c) } #ifdef CONFIG_VGACON_SOFT_SCROLLBACK -#include /* software scrollback */ static void *vgacon_scrollback; static int vgacon_scrollback_tail;