diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-09-04 19:18:07 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-09-04 19:18:07 +0200 |
| commit | 4d854194f3e60d56d68e82a934d5613c42c1273b (patch) | |
| tree | 685c39d2c4452f9208240833b13c25e97c2a2c1f /arch/mips/powertv/reset.c | |
| parent | MIPS: Add driver for the built-in PCI controller of the RT3883 SoC (diff) | |
| parent | MIPS: powertv: Drop BOOTLOADER_DRIVER Kconfig symbol (diff) | |
| download | linux-4d854194f3e60d56d68e82a934d5613c42c1273b.tar.xz linux-4d854194f3e60d56d68e82a934d5613c42c1273b.zip | |
Merge branch '3.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/powertv/reset.c')
| -rw-r--r-- | arch/mips/powertv/reset.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/mips/powertv/reset.c b/arch/mips/powertv/reset.c index 0007652cb774..11c32fbf2784 100644 --- a/arch/mips/powertv/reset.c +++ b/arch/mips/powertv/reset.c @@ -21,24 +21,12 @@ #include <linux/io.h> #include <asm/reboot.h> /* Not included by linux/reboot.h */ -#ifdef CONFIG_BOOTLOADER_DRIVER -#include <asm/mach-powertv/kbldr.h> -#endif - #include <asm/mach-powertv/asic_regs.h> #include "reset.h" static void mips_machine_restart(char *command) { -#ifdef CONFIG_BOOTLOADER_DRIVER - /* - * Call the bootloader's reset function to ensure - * that persistent data is flushed before hard reset - */ - kbldr_SetCauseAndReset(); -#else writel(0x1, asic_reg_addr(watchdog)); -#endif } void mips_reboot_setup(void) |