From a401c53acb6a0344b2a8bd7c9fcd6ef75aec3409 Mon Sep 17 00:00:00 2001 From: Aleksandr Rybalko Date: Wed, 18 Jun 2014 22:10:10 +0000 Subject: [PATCH] Rename vt(4) vga module to dismiss interference with syscons(4) vga module. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/conf/files | 2 +- sys/dev/vt/hw/vga/{vga.c => vt_vga.c} | 2 +- sys/dev/vt/hw/vga/{vga_reg.h => vt_vga_reg.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename sys/dev/vt/hw/vga/{vga.c => vt_vga.c} (99%) rename sys/dev/vt/hw/vga/{vga_reg.h => vt_vga_reg.h} (100%) diff --git a/sys/conf/files b/sys/conf/files index 08ab51ffc19..cc907c50db1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2526,7 +2526,7 @@ dev/vt/font/vt_font_default.c optional vt dev/vt/font/vt_mouse_cursor.c optional vt dev/vt/hw/efifb/efifb.c optional vt_efifb dev/vt/hw/fb/vt_fb.c optional vt -dev/vt/hw/vga/vga.c optional vt vt_vga +dev/vt/hw/vga/vt_vga.c optional vt vt_vga dev/vt/logo/logo_freebsd.c optional vt splash dev/vt/vt_buf.c optional vt dev/vt/vt_consolectl.c optional vt diff --git a/sys/dev/vt/hw/vga/vga.c b/sys/dev/vt/hw/vga/vt_vga.c similarity index 99% rename from sys/dev/vt/hw/vga/vga.c rename to sys/dev/vt/hw/vga/vt_vga.c index a13e094a107..15bed12c804 100644 --- a/sys/dev/vt/hw/vga/vga.c +++ b/sys/dev/vt/hw/vga/vt_vga.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include diff --git a/sys/dev/vt/hw/vga/vga_reg.h b/sys/dev/vt/hw/vga/vt_vga_reg.h similarity index 100% rename from sys/dev/vt/hw/vga/vga_reg.h rename to sys/dev/vt/hw/vga/vt_vga_reg.h