diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile
index b7b5778add17..0063d044ca71 100644
--- a/drivers/staging/dgap/Makefile
+++ b/drivers/staging/dgap/Makefile
@@ -1,5 +1 @@
 obj-$(CONFIG_DGAP) += dgap.o
-
-
-dgap-objs :=	dgap_driver.o 
-
diff --git a/drivers/staging/dgap/dgap_driver.c b/drivers/staging/dgap/dgap.c
similarity index 99%
rename from drivers/staging/dgap/dgap_driver.c
rename to drivers/staging/dgap/dgap.c
index 21b0f90fbee8..6f07e271184d 100644
--- a/drivers/staging/dgap/dgap_driver.c
+++ b/drivers/staging/dgap/dgap.c
@@ -49,7 +49,7 @@
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 
-#include "dgap_driver.h"
+#include "dgap.h"
 
 #define init_MUTEX(sem)         sema_init(sem, 1)
 #define DECLARE_MUTEX(name)     \
diff --git a/drivers/staging/dgap/dgap_driver.h b/drivers/staging/dgap/dgap.h
similarity index 100%
rename from drivers/staging/dgap/dgap_driver.h
rename to drivers/staging/dgap/dgap.h