diff --git a/[refs] b/[refs] index 359597bc3617..077daf6db412 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e21b9f2e9a580ce7375ec58953c1bb19aabe0db4 +refs/heads/master: dbeb198d9366eb3d3ad64444ceecb5b1d5b5d7ef diff --git a/trunk/arch/ppc/syslib/mpc52xx_pci.c b/trunk/arch/ppc/syslib/mpc52xx_pci.c index 4ac19080eb85..e6cb3e26615a 100644 --- a/trunk/arch/ppc/syslib/mpc52xx_pci.c +++ b/trunk/arch/ppc/syslib/mpc52xx_pci.c @@ -151,7 +151,7 @@ mpc52xx_pci_setup(struct mpc52xx_pci __iomem *pci_regs) #endif } -static void __init +static void mpc52xx_pci_fixup_resources(struct pci_dev *dev) { int i;