diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index d4a87c07e177..961a60c1afe9 100644
--- a/drivers/staging/gma500/Makefile
+++ b/drivers/staging/gma500/Makefile
@@ -10,12 +10,12 @@ psb_gfx-y += gem_glue.o \
 	  gem.o \
 	  gtt.o \
 	  intel_bios.o \
+	  intel_i2c.o \
 	  intel_opregion.o \
 	  mmu.o \
 	  power.o \
 	  psb_drv.o \
 	  psb_intel_display.o \
-	  psb_intel_i2c.o \
 	  psb_intel_lvds.o \
 	  psb_intel_modes.o \
 	  psb_intel_sdvo.o \
diff --git a/drivers/staging/gma500/psb_intel_i2c.c b/drivers/staging/gma500/intel_i2c.c
similarity index 100%
rename from drivers/staging/gma500/psb_intel_i2c.c
rename to drivers/staging/gma500/intel_i2c.c