diff options
| author | Kumar Gala <galak@freescale.com> | 2005-06-21 20:15:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 21:46:23 -0400 |
| commit | b264c3527930ca4812fefc505fde9ad99d8a0117 (patch) | |
| tree | 26d7ff6f5ed67d162df70dffa5c6257671c1f5f4 /arch/ppc/kernel | |
| parent | c93fcff6952068d484f2f7dae187037f46235647 (diff) | |
[PATCH] ppc32: Converted MPC10X bridge to use platform devices instead of OCP
Converted the MPC10x bridge support (used by MPC10x and 8240/1/5) to used
the standard platform device model.
Signed-off-by: Matt McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 5c20266e3b1f..c344c66e68f7 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include <asm/xmon.h> | 41 | #include <asm/xmon.h> |
| 42 | #include <asm/ocp.h> | 42 | #include <asm/ocp.h> |
| 43 | 43 | ||
| 44 | #if defined(CONFIG_85xx) || defined(CONFIG_83xx) | 44 | #if defined(CONFIG_85xx) || defined(CONFIG_83xx) || defined(CONFIG_MPC10X_BRIDGE) |
| 45 | #include <asm/ppc_sys.h> | 45 | #include <asm/ppc_sys.h> |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| @@ -249,7 +249,7 @@ int show_cpuinfo(struct seq_file *m, void *v) | |||
| 249 | seq_printf(m, "bogomips\t: %lu.%02lu\n", | 249 | seq_printf(m, "bogomips\t: %lu.%02lu\n", |
| 250 | lpj / (500000/HZ), (lpj / (5000/HZ)) % 100); | 250 | lpj / (500000/HZ), (lpj / (5000/HZ)) % 100); |
| 251 | 251 | ||
| 252 | #if defined(CONFIG_85xx) || defined(CONFIG_83xx) | 252 | #if defined(CONFIG_85xx) || defined(CONFIG_83xx) || defined(CONFIG_MPC10X_BRIDGE) |
| 253 | if (cur_ppc_sys_spec->ppc_sys_name) | 253 | if (cur_ppc_sys_spec->ppc_sys_name) |
| 254 | seq_printf(m, "chipset\t\t: %s\n", | 254 | seq_printf(m, "chipset\t\t: %s\n", |
| 255 | cur_ppc_sys_spec->ppc_sys_name); | 255 | cur_ppc_sys_spec->ppc_sys_name); |