diff options
| -rw-r--r-- | arch/powerpc/platforms/85xx/Makefile | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/misc.c (renamed from arch/powerpc/platforms/85xx/mpc85xx.c) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile index b443206e61af..70e1190809f8 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the PowerPC 85xx linux kernel. | 2 | # Makefile for the PowerPC 85xx linux kernel. |
| 3 | # | 3 | # |
| 4 | obj-$(CONFIG_PPC_85xx) += mpc85xx.o mpc85xx_ads.o | 4 | obj-$(CONFIG_PPC_85xx) += misc.o mpc85xx_ads.o |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx.c b/arch/powerpc/platforms/85xx/misc.c index 82510385d88a..26c5e822c7c8 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx.c +++ b/arch/powerpc/platforms/85xx/misc.c | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | extern void abort(void); | 17 | extern void abort(void); |
| 18 | 18 | ||
| 19 | void | 19 | void mpc85xx_restart(char *cmd) |
| 20 | mpc85xx_restart(char *cmd) | ||
| 21 | { | 20 | { |
| 22 | local_irq_disable(); | 21 | local_irq_disable(); |
| 23 | abort(); | 22 | abort(); |
| @@ -28,4 +27,5 @@ phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size) | |||
| 28 | { | 27 | { |
| 29 | return addr; | 28 | return addr; |
| 30 | }; | 29 | }; |
| 30 | |||
| 31 | EXPORT_SYMBOL(fixup_bigphys_addr); | 31 | EXPORT_SYMBOL(fixup_bigphys_addr); |
