ARM: SAMSUNG: Fixup merge problem · 3d5c1fdcaa - Gogs

ARM: SAMSUNG: Fixup merge problem

Fixup merge which re-introduced the setup-i2c0 helper

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

Ben Dooks 15 years ago

parent

925c68cdca

commit

3d5c1fdcaa

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
arch/arm/plat-s5p/Makefile
							 
								View File
							
				@@ -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
			
				+