diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-30 10:59:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-30 10:59:04 +0200 |
| commit | 063e04776172f93b16a5eefd5661a340c1126513 (patch) | |
| tree | 19cb1623631c8cc5dcf0d91f4731feec7cbefa04 /arch/mips/lantiq/prom.h | |
| parent | 59cd358a7a5b2f6b61faa01dae6cfda3830ac62a (diff) | |
| parent | 731a7378b81c2f5fa88ca1ae20b83d548d5613dc (diff) | |
Merge branch 'linus' into perf/urgent
Merge back Linus's latest branch so that we pick up the uprobes changes.
( I tested this branch locally and while it's one from the middle of the
merge window it's a good one to base further work off. )
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/lantiq/prom.h')
| -rw-r--r-- | arch/mips/lantiq/prom.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/lantiq/prom.h b/arch/mips/lantiq/prom.h index b4229d94280..a3fa1a2bfaa 100644 --- a/arch/mips/lantiq/prom.h +++ b/arch/mips/lantiq/prom.h @@ -10,16 +10,22 @@ #define _LTQ_PROM_H__ #define LTQ_SYS_TYPE_LEN 0x100 +#define LTQ_SYS_REV_LEN 0x10 struct ltq_soc_info { unsigned char *name; unsigned int rev; + unsigned char rev_type[LTQ_SYS_REV_LEN]; + unsigned int srev; unsigned int partnum; unsigned int type; unsigned char sys_type[LTQ_SYS_TYPE_LEN]; + unsigned char *compatible; }; extern void ltq_soc_detect(struct ltq_soc_info *i); -extern void ltq_soc_setup(void); +extern void ltq_soc_init(void); + +extern struct boot_param_header __dtb_start; #endif |