diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 11:54:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 11:54:51 +0200 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/include | |
| parent | Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable (diff) | |
| parent | ARM: remove boot_params from struct machine_desc (diff) | |
| download | linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.tar.xz linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.zip | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach/arch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 217aa1911dd7..727da118bcc1 100644 --- 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 */ - unsigned long boot_params; /* tagged list */ + unsigned long atag_offset; /* tagged list (relative) */ const char **dt_compat; /* array of device tree * 'compatible' strings */ |