projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9973022
ffe7f95
)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Wed, 25 Mar 2009 18:31:35 +0000
(18:31 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Wed, 25 Mar 2009 18:31:35 +0000
(18:31 +0000)
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-2430sdp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-apollon.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-h4.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-ldp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-omap3beagle.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/devices.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/include/mach/cpu.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-omap/include/mach/system.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
arch/arm/mach-omap2/Makefile
Simple merge
diff --cc
arch/arm/mach-omap2/board-2430sdp.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-apollon.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-h4.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-ldp.c
index
c715805
,
92661e5
..
e096f77
---
1
/
arch/arm/mach-omap2/board-ldp.c
---
2
/
arch/arm/mach-omap2/board-ldp.c
+++ b/
arch/arm/mach-omap2/board-ldp.c
@@@
-36,8
-34,10
+35,9
@@@
#include <mach/common.h>
#include <mach/gpmc.h>
-#include <asm/io.h>
#include <asm/delay.h>
#include <mach/control.h>
+ #include <mach/usb.h>
#include "mmc-twl4030.h"
diff --cc
arch/arm/mach-omap2/board-omap3beagle.c
Simple merge
diff --cc
arch/arm/mach-omap2/devices.c
Simple merge
diff --cc
arch/arm/plat-omap/Kconfig
Simple merge
diff --cc
arch/arm/plat-omap/include/mach/cpu.h
Simple merge
diff --cc
arch/arm/plat-omap/include/mach/system.h
index
cb8c0ef
,
8422845
..
1060e34
---
1
/
arch/arm/plat-omap/include/mach/system.h
---
2
/
arch/arm/plat-omap/include/mach/system.h
+++ b/
arch/arm/plat-omap/include/mach/system.h
@@@
-9,12
-9,14
+9,14
@@@
#include <asm/mach-types.h>
#include <mach/hardware.h>
+#include <mach/prcm.h>
+
#ifndef CONFIG_MACH_VOICEBLUE
#define voiceblue_reset() do {} while (0)
+ #else
+ extern void voiceblue_reset(void);
#endif
-extern void omap_prcm_arch_reset(char mode);
-
static inline void arch_idle(void)
{
cpu_do_idle();