diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-07 08:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-07 08:31:47 +0100 |
| commit | ded25480d8c5e56d9dcbf53a88d05f023b9740c4 (patch) | |
| tree | 8691bdf7f0fc801b08b114204c83d25007eb8fba /arch/ppc | |
| parent | b3055b0f6b1687089b914eb8cde5bbb73cfca7a1 (diff) | |
| parent | 97607e85cdc44824e9617c74325bc9bc6405c383 (diff) | |
| download | barebox-ded25480d8c5e56d9dcbf53a88d05f023b9740c4.tar.gz barebox-ded25480d8c5e56d9dcbf53a88d05f023b9740c4.tar.xz | |
Merge branch 'for-next/rpi'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/mach-mpc5xxx/cpu.c | 4 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/fdt.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c index 0ece4a9ed9..c860e709f2 100644 --- a/arch/ppc/mach-mpc5xxx/cpu.c +++ b/arch/ppc/mach-mpc5xxx/cpu.c @@ -77,7 +77,7 @@ void __noreturn reset_cpu (unsigned long addr) /* ------------------------------------------------------------------------- */ #ifdef CONFIG_OFTREE -static int of_mpc5200_fixup(struct device_node *root) +static int of_mpc5200_fixup(struct device_node *root, void *unused) { struct device_node *node; @@ -103,7 +103,7 @@ static int of_mpc5200_fixup(struct device_node *root) static int of_register_mpc5200_fixup(void) { - return of_register_fixup(of_mpc5200_fixup); + return of_register_fixup(of_mpc5200_fixup, NULL); } late_initcall(of_register_mpc5200_fixup); #endif diff --git a/arch/ppc/mach-mpc85xx/fdt.c b/arch/ppc/mach-mpc85xx/fdt.c index 65de6f1104..fd919a56e7 100644 --- a/arch/ppc/mach-mpc85xx/fdt.c +++ b/arch/ppc/mach-mpc85xx/fdt.c @@ -89,7 +89,7 @@ error: return -ENODEV; } -static int fdt_cpu_setup(struct device_node *blob) +static int fdt_cpu_setup(struct device_node *blob, void *unused) { struct device_node *node; struct sys_info sysinfo; @@ -139,6 +139,6 @@ static int fdt_cpu_setup(struct device_node *blob) static int of_register_mpc85xx_fixup(void) { - return of_register_fixup(fdt_cpu_setup); + return of_register_fixup(fdt_cpu_setup, NULL); } late_initcall(of_register_mpc85xx_fixup); |