projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f44f82e
64a99d2
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Thu, 7 Aug 2008 08:55:03 +0000
(09:55 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 7 Aug 2008 08:55:03 +0000
(09:55 +0100)
1
2
arch/arm/mach-at91/board-cap9adk.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-qil-a9260.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-sam9-l9260.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-sam9260ek.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-sam9261ek.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-sam9263ek.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-sam9g20ek.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-usb-a9260.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-at91/board-usb-a9263.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/i2c/busses/i2c-s3c2410.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/spi_s3c24xx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-at91/board-cap9adk.c
Simple merge
diff --cc
arch/arm/mach-at91/board-qil-a9260.c
Simple merge
diff --cc
arch/arm/mach-at91/board-sam9-l9260.c
Simple merge
diff --cc
arch/arm/mach-at91/board-sam9260ek.c
Simple merge
diff --cc
arch/arm/mach-at91/board-sam9261ek.c
Simple merge
diff --cc
arch/arm/mach-at91/board-sam9263ek.c
Simple merge
diff --cc
arch/arm/mach-at91/board-sam9g20ek.c
Simple merge
diff --cc
arch/arm/mach-at91/board-usb-a9260.c
Simple merge
diff --cc
arch/arm/mach-at91/board-usb-a9263.c
Simple merge
diff --cc
drivers/i2c/busses/i2c-s3c2410.c
index 598b9cbd3a05265c20876bd6bc22db4e64d5939a,4864723c74257b6e63e2d25d6c4d3ae8676f1675..b216bfbea78c1b789a2561e52ff20598d72a1801
---
1
/
drivers/i2c/busses/i2c-s3c2410.c
---
2
/
drivers/i2c/busses/i2c-s3c2410.c
+++ b/
drivers/i2c/busses/i2c-s3c2410.c
@@@
-33,8
-33,9
+33,9
@@@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
+ #include <linux/cpufreq.h>
-#include <asm/hardware.h>
+#include <asm/
arch/
hardware.h>
#include <asm/irq.h>
#include <asm/io.h>
diff --cc
drivers/spi/spi_s3c24xx.c
Simple merge