diff --git a/[refs] b/[refs] index eab91c507064..206cb8f083a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40544b0411306029acccdc1e1eafa2600708d71b +refs/heads/master: 15eac0f8471e2be2ba8b7f80782eb758efd15233 diff --git a/trunk/drivers/staging/xgifb/Makefile b/trunk/drivers/staging/xgifb/Makefile index 3c8c7de9eadd..55e519905346 100644 --- a/trunk/drivers/staging/xgifb/Makefile +++ b/trunk/drivers/staging/xgifb/Makefile @@ -1,4 +1,4 @@ obj-$(CONFIG_FB_XGI) += xgifb.o -xgifb-y := XGI_main_26.o vb_init.o vb_setmode.o vb_util.o vb_ext.o +xgifb-y := XGI_main_26.o vb_init.o vb_setmode.o vb_util.o diff --git a/trunk/drivers/staging/xgifb/vb_ext.c b/trunk/drivers/staging/xgifb/vb_ext.c deleted file mode 100644 index ee890005ed08..000000000000 --- a/trunk/drivers/staging/xgifb/vb_ext.c +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -#include "XGIfb.h" - -#include "vb_def.h" -#include "vgatypes.h" -#include "vb_struct.h" -#include "vb_util.h" -#include "vb_setmode.h" -#include "vb_ext.h" - -/************************************************************** - *********************** Dynamic Sense ************************ - *************************************************************/ - diff --git a/trunk/drivers/staging/xgifb/vb_ext.h b/trunk/drivers/staging/xgifb/vb_ext.h deleted file mode 100644 index 894223d11503..000000000000 --- a/trunk/drivers/staging/xgifb/vb_ext.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _VBEXT_ -#define _VBEXT_ - -#endif diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c index 159ac02e5213..9b86f4f716d5 100644 --- a/trunk/drivers/staging/xgifb/vb_init.c +++ b/trunk/drivers/staging/xgifb/vb_init.c @@ -10,7 +10,6 @@ #include "vb_util.h" #include "vb_setmode.h" #include "vb_init.h" -#include "vb_ext.h" #include