diff options
Diffstat (limited to 'include/asm-ppc/ppc_sys.h')
-rw-r--r-- | include/asm-ppc/ppc_sys.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h index 8ea624566231..048f7c8596ee 100644 --- a/include/asm-ppc/ppc_sys.h +++ b/include/asm-ppc/ppc_sys.h | |||
@@ -21,7 +21,9 @@ | |||
21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
23 | 23 | ||
24 | #if defined(CONFIG_83xx) | 24 | #if defined(CONFIG_8260) |
25 | #include <asm/mpc8260.h> | ||
26 | #elif defined(CONFIG_83xx) | ||
25 | #include <asm/mpc83xx.h> | 27 | #include <asm/mpc83xx.h> |
26 | #elif defined(CONFIG_85xx) | 28 | #elif defined(CONFIG_85xx) |
27 | #include <asm/mpc85xx.h> | 29 | #include <asm/mpc85xx.h> |
@@ -50,6 +52,7 @@ extern struct ppc_sys_spec *cur_ppc_sys_spec; | |||
50 | /* determine which specific SOC we are */ | 52 | /* determine which specific SOC we are */ |
51 | extern void identify_ppc_sys_by_id(u32 id) __init; | 53 | extern void identify_ppc_sys_by_id(u32 id) __init; |
52 | extern void identify_ppc_sys_by_name(char *name) __init; | 54 | extern void identify_ppc_sys_by_name(char *name) __init; |
55 | extern void identify_ppc_sys_by_name_and_id(char *name, u32 id) __init; | ||
53 | 56 | ||
54 | /* describes all devices that may exist in a given family of processors */ | 57 | /* describes all devices that may exist in a given family of processors */ |
55 | extern struct platform_device ppc_sys_platform_devices[]; | 58 | extern struct platform_device ppc_sys_platform_devices[]; |