diff options
| author |   Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-10-14 22:37:52 -0400 |
|---|---|---|
| committer |   Nicolas Pitre <nico@fluxnic.net> | 2010-10-20 00:27:14 -0400 |
| commit | d71e3eb5894dbb626dc7e28cfd4f33ebee9a739a (patch) | |
| tree | f94f17fe9be685a1bddb770eab5b6516b11d5558 /arch/arm/include | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| download | linux-dev-d71e3eb5894dbb626dc7e28cfd4f33ebee9a739a.tar.xz linux-dev-d71e3eb5894dbb626dc7e28cfd4f33ebee9a739a.zip | |
ARM: make struct machine_desc definition coherent with its comment
As mentioned in the comment right at the top, the first four fields
are directly accessed by assembly code in head.S. Move nr_irqs so the
comment is true again.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach/arch.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 8a0dd18ba642..ac6851133fe3 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h @@ -20,7 +20,6 @@ struct machine_desc { * by assembler code in head.S, head-common.S */ unsigned int nr; /* architecture number */ - unsigned int nr_irqs; /* number of IRQs */ unsigned int phys_io; /* start of physical io */ unsigned int io_pg_offst; /* byte offset for io * page tabe entry */ @@ -28,6 +27,8 @@ struct machine_desc { const char *name; /* architecture name */ unsigned long boot_params; /* tagged list */ + unsigned int nr_irqs; /* number of IRQs */ + unsigned int video_start; /* start of video RAM */ unsigned int video_end; /* end of video RAM */ |