projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
925c68c
)
ARM: SAMSUNG: Fixup merge problem
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 11:49:25 +0000
(20:49 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 11:49:25 +0000
(20:49 +0900)
Fixup merge which re-introduced the setup-i2c0 helper
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
arch/arm/plat-s5p/Makefile
patch
|
blob
|
history
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
+