diff options
| author | Rob Herring | 2013-09-25 22:49:28 +0200 |
|---|---|---|
| committer | Rob Herring | 2013-10-10 03:03:57 +0200 |
| commit | 986c494b3c05bac5eace21f8e3a42f2afbfcbd34 (patch) | |
| tree | 039ce7d9c78bc1f4f8616202c90d107da82cd95f /arch/metag/include | |
| parent | arm64: use common of_flat_dt_get_machine_name (diff) | |
| download | kernel-qcow2-linux-986c494b3c05bac5eace21f8e3a42f2afbfcbd34.tar.gz kernel-qcow2-linux-986c494b3c05bac5eace21f8e3a42f2afbfcbd34.tar.xz kernel-qcow2-linux-986c494b3c05bac5eace21f8e3a42f2afbfcbd34.zip | |
metag: use common of_flat_dt_match_machine
Convert metag to use the common of_flat_dt_get_machine_name function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
[james.hogan: fix missing arch_get_next_mach and const mismatch]
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'arch/metag/include')
| -rw-r--r-- | arch/metag/include/asm/mach/arch.h | 2 | ||||
| -rw-r--r-- | arch/metag/include/asm/prom.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/metag/include/asm/mach/arch.h b/arch/metag/include/asm/mach/arch.h index 12c5664fea6e..433f94624fa2 100644 --- a/arch/metag/include/asm/mach/arch.h +++ b/arch/metag/include/asm/mach/arch.h @@ -53,7 +53,7 @@ struct machine_desc { /* * Current machine - only accessible during boot. */ -extern struct machine_desc *machine_desc; +extern const struct machine_desc *machine_desc; /* * Machine type table - also only accessible during boot diff --git a/arch/metag/include/asm/prom.h b/arch/metag/include/asm/prom.h index d2aa35d2228e..9f67cbf3dcb7 100644 --- a/arch/metag/include/asm/prom.h +++ b/arch/metag/include/asm/prom.h @@ -17,7 +17,7 @@ #include <asm/setup.h> #define HAVE_ARCH_DEVTREE_FIXUPS -extern struct machine_desc *setup_machine_fdt(void *dt); +extern const struct machine_desc *setup_machine_fdt(void *dt); extern void copy_fdt(void); #endif /* __ASM_METAG_PROM_H */ |