projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[linux-drm-fsl-dcu.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_ads.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index bda2e55e6c4c1db7e5f84eadd8a2c18d18682894..c56fce57621c1cb5c943fbfeb94de26c8c3e1cd8 100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@
-45,8
+45,7
@@
unsigned long isa_mem_base = 0;
#endif
#ifdef CONFIG_PCI
#endif
#ifdef CONFIG_PCI
-int
-mpc85xx_exclude_device(u_char bus, u_char devfn)
+static int mpc85xx_exclude_device(u_char bus, u_char devfn)
{
if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND;
{
if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND;
@@
-69,7
+68,7
@@
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
#endif /* CONFIG_CPM2 */
#endif /* CONFIG_CPM2 */
-void __init mpc85xx_ads_pic_init(void)
+
static
void __init mpc85xx_ads_pic_init(void)
{
struct mpic *mpic;
struct resource r;
{
struct mpic *mpic;
struct resource r;
@@
-254,7
+253,7
@@
static void __init mpc85xx_ads_setup_arch(void)
#endif
}
#endif
}
-void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
+
static
void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
{
uint pvid, svid, phid1;
uint memsize = total_memory;
{
uint pvid, svid, phid1;
uint memsize = total_memory;