git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
mach
/
arch.h
diff --git
a/arch/arm/include/asm/mach/arch.h
b/arch/arm/include/asm/mach/arch.h
index
c569998
..
7d19425
100644
(file)
--- a/
arch/arm/include/asm/mach/arch.h
+++ b/
arch/arm/include/asm/mach/arch.h
@@
-17,7
+17,7
@@
struct sys_timer;
struct machine_desc {
unsigned int nr; /* architecture number */
const char *name; /* architecture name */
struct machine_desc {
unsigned int nr; /* architecture number */
const char *name; /* architecture name */
- unsigned long
boot_params; /* tagged list
*/
+ unsigned long
atag_offset; /* tagged list (relative)
*/
const char **dt_compat; /* array of device tree
* 'compatible' strings */
const char **dt_compat; /* array of device tree
* 'compatible' strings */