ARM: SAMSUNG: Fixup merge problem

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / plat-s5p / Makefile

diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 25941a5..39c242b 100644 (file)
--- 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
+