diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /include/asm-arm/mach/arch.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'include/asm-arm/mach/arch.h')
| -rw-r--r-- | include/asm-arm/mach/arch.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h index 4fa95084a8c0..7273c6fd95b5 100644 --- a/include/asm-arm/mach/arch.h +++ b/include/asm-arm/mach/arch.h | |||
| @@ -48,10 +48,10 @@ struct machine_desc { | |||
| 48 | * Set of macros to define architecture features. This is built into | 48 | * Set of macros to define architecture features. This is built into |
| 49 | * a table by the linker. | 49 | * a table by the linker. |
| 50 | */ | 50 | */ |
| 51 | #define MACHINE_START(_type,_name) \ | 51 | #define MACHINE_START(_type,_name) \ |
| 52 | const struct machine_desc __mach_desc_##_type \ | 52 | static const struct machine_desc __mach_desc_##_type \ |
| 53 | __attribute__((__section__(".arch.info.init"))) = { \ | 53 | __attribute__((__section__(".arch.info.init"))) = { \ |
| 54 | .nr = MACH_TYPE_##_type, \ | 54 | .nr = MACH_TYPE_##_type, \ |
| 55 | .name = _name, | 55 | .name = _name, |
| 56 | 56 | ||
| 57 | #define MACHINE_END \ | 57 | #define MACHINE_END \ |