Commit 3d5c1fdc authored May 20, 2010 by Ben Dooks

ARM: SAMSUNG: Fixup merge problem



Fixup merge which re-introduced the setup-i2c0 helper

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

parent 925c68cd

arch/arm/plat-s5p/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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