git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_ds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index
25f41cd
..
00c5358
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@
-115,7
+115,6
@@
void __init mpc85xx_ds_pic_init(void)
#ifdef CONFIG_PCI
static int primary_phb_addr;
#ifdef CONFIG_PCI
static int primary_phb_addr;
-extern int uses_fsl_uli_m1575;
extern int uli_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn);
extern int uli_exclude_device(struct pci_controller *hose,
u_char bus, u_char devfn);
@@
-161,7
+160,6
@@
static void __init mpc85xx_ds_setup_arch(void)
}
}
}
}
- uses_fsl_uli_m1575 = 1;
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
#endif
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
#endif