aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 20:49:25 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 20:49:25 +0900
commit3d5c1fdcaa7d3d414ce5928601b9578b80441a90 (patch)
treeb2b72318c2c8a20e2bf71fc9edb3322507812618 /arch/arm/plat-s5p
parent925c68cdca7412cb0ce9d63dab3cbfc9b47b3c8d (diff)
downloadmrst-s0i3-test-3d5c1fdcaa7d3d414ce5928601b9578b80441a90.tar.gz
mrst-s0i3-test-3d5c1fdcaa7d3d414ce5928601b9578b80441a90.tar.xz
mrst-s0i3-test-3d5c1fdcaa7d3d414ce5928601b9578b80441a90.zip
ARM: SAMSUNG: Fixup merge problem
Fixup merge which re-introduced the setup-i2c0 helper Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s5p')
-rw-r--r--arch/arm/plat-s5p/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 25941a5d3bf..39c242bb9d5 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -17,4 +17,4 @@ obj-y += cpu.o
obj-y += clock.o
obj-y += irq.o
obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o
-obj-y += setup-i2c0.o
+