diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-05 14:16:48 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-05 14:16:48 +1100 |
| commit | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (patch) | |
| tree | d327446284dcce52ad3ea54ffe8a7dddfcb8b86d /arch/powerpc/platforms/85xx/mpc85xx_ds.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (diff) | |
| parent | powerpc/qe: Select QE_USB with USB_GADGET_FSL_QE (diff) | |
| download | linux-dev-4aa12f7b927c3cac0e0cf3503642597527d0ece0.tar.xz linux-dev-4aa12f7b927c3cac0e0cf3503642597527d0ece0.zip | |
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_ds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ds.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index a8301c8ad537..7326d904202c 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -148,6 +148,9 @@ static int mpc85xx_exclude_device(struct pci_controller *hose, /* * Setup the architecture */ +#ifdef CONFIG_SMP +extern void __init mpc85xx_smp_init(void); +#endif static void __init mpc85xx_ds_setup_arch(void) { #ifdef CONFIG_PCI @@ -173,6 +176,10 @@ static void __init mpc85xx_ds_setup_arch(void) ppc_md.pci_exclude_device = mpc85xx_exclude_device; #endif +#ifdef CONFIG_SMP + mpc85xx_smp_init(); +#endif + printk("MPC85xx DS board from Freescale Semiconductor\n"); } |