From: Ben Dooks Date: Thu, 20 May 2010 11:49:25 +0000 (+0900) Subject: ARM: SAMSUNG: Fixup merge problem X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d5c1fdcaa7d3d414ce5928601b9578b80441a90;p=platform%2Fkernel%2Flinux-exynos.git ARM: SAMSUNG: Fixup merge problem Fixup merge which re-introduced the setup-i2c0 helper Signed-off-by: Ben Dooks --- diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile index 25941a5..39c242b 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 +