Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 883a805d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/4xx: Fix build of PCI code on 405 



Commit 112d1fe9
"powerpc/4xx: Add check_link to struct ppc4xx_pciex_hwops" inadvertently
broke 405 builds due to some functions being over protected by an
ifdef CONFIG_44x.

Move them back out.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 598c8231

arch/powerpc/sysdev/ppc4xx_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -655,8 +655,6 @@ struct ppc4xx_pciex_hwops 


static struct ppc4xx_pciex_hwops *ppc4xx_pciex_hwops;



#ifdef CONFIG_44x



static int __init ppc4xx_pciex_wait_on_sdr(struct ppc4xx_pciex_port *port,

					   unsigned int sdr_offset,

					   unsigned int mask,
@@ -688,6 +686,7 @@ static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port) 
	return 0;

}





static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port)

{

	printk(KERN_INFO "PCIE%d: Checking link...\n", port->index);
@@ -718,6 +717,8 @@ static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port) 
		printk(KERN_INFO "PCIE%d: No device detected.\n", port->index);

}



#ifdef CONFIG_44x



/* Check various reset bits of the 440SPe PCIe core */

static int __init ppc440spe_pciex_check_reset(struct device_node *np)

{