From 3d5c1fdcaa7d3d414ce5928601b9578b80441a90 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 20 May 2010 20:49:25 +0900 Subject: ARM: SAMSUNG: Fixup merge problem Fixup merge which re-introduced the setup-i2c0 helper Signed-off-by: Ben Dooks --- arch/arm/plat-s5p/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/plat-s5p') diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index 25941a5d3bf6..39c242bb9d58 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 + -- cgit v1.2.3