aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <[email protected]>2011-07-05 15:43:07 +0100
committerGreg Kroah-Hartman <[email protected]>2011-07-05 08:20:43 -0700
commit72786d5fb1a6a680126853bfda1e762bd62b329a (patch)
tree6673bd34e8d0eb77ef91bfdb9f5e6db416081d76
parent641b41858b29d4ebf1be3921cab7b2cac7b18111 (diff)
gma500: move the i2c code
This again is similar to upstream so give it a sensible name ready to look at any merging or synchronization Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/gma500/Makefile2
-rw-r--r--drivers/staging/gma500/intel_i2c.c (renamed from drivers/staging/gma500/psb_intel_i2c.c)0
2 files changed, 1 insertions, 1 deletions
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
index e33432df510c..e33432df510c 100644
--- a/drivers/staging/gma500/psb_intel_i2c.c
+++ b/drivers/staging/gma500/intel_i2c.c