Skip to content

Commit

Permalink
ARM: SAMSUNG: Fixup merge problem
Browse files Browse the repository at this point in the history 
Fixup merge which re-introduced the setup-i2c0 helper

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Ben Dooks committed May 20, 2010
1 parent 925c68c commit 3d5c1fd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/plat-s5p/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3d5c1fd

Please sign in to comment.