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

Commit fcdb27ad authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again. 


    
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9414d362

arch/mips/au1000/common/setup.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/pm.h>





#include <asm/cpu.h>

#include <asm/cpu.h>

#include <asm/bootinfo.h>

#include <asm/bootinfo.h>
@@ -125,7 +126,7 @@ void __init plat_setup(void) 
#endif

#endif

	_machine_restart = au1000_restart;

	_machine_restart = au1000_restart;

	_machine_halt = au1000_halt;

	_machine_halt = au1000_halt;

	_machine_power_off = au1000_power_off;

	pm_power_off = au1000_power_off;

	board_time_init = au1xxx_time_init;

	board_time_init = au1xxx_time_init;

	board_timer_setup = au1xxx_timer_setup;

	board_timer_setup = au1xxx_timer_setup;

arch/mips/cobalt/setup.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 * for more details.

 *

 *

 * Copyright (C) 1996, 1997, 2004 by Ralf Baechle (ralf@linux-mips.org)

 * Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org)

 * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)

 * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)

 *

 *

 */

 */
@@ -13,6 +13,7 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/pm.h>

#include <linux/serial.h>

#include <linux/serial.h>

#include <linux/serial_core.h>

#include <linux/serial_core.h>
@@ -99,7 +100,7 @@ void __init plat_setup(void) 




	_machine_restart = cobalt_machine_restart;

	_machine_restart = cobalt_machine_restart;

	_machine_halt = cobalt_machine_halt;

	_machine_halt = cobalt_machine_halt;

	_machine_power_off = cobalt_machine_power_off;

	pm_power_off = cobalt_machine_power_off;





	board_timer_setup = cobalt_timer_setup;

	board_timer_setup = cobalt_timer_setup;

arch/mips/ddb5xxx/ddb5074/setup.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/ide.h>

#include <linux/ide.h>

#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/pm.h>





#include <asm/addrspace.h>

#include <asm/addrspace.h>

#include <asm/bcache.h>

#include <asm/bcache.h>
@@ -95,7 +96,7 @@ void __init plat_setup(void) 




	_machine_restart = ddb_machine_restart;

	_machine_restart = ddb_machine_restart;

	_machine_halt = ddb_machine_halt;

	_machine_halt = ddb_machine_halt;

	_machine_power_off = ddb_machine_power_off;

	pm_power_off = ddb_machine_power_off;





	ddb_out32(DDB_BAR0, 0);

	ddb_out32(DDB_BAR0, 0);

arch/mips/ddb5xxx/ddb5476/setup.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/pm.h>





#include <asm/addrspace.h>

#include <asm/addrspace.h>

#include <asm/bcache.h>

#include <asm/bcache.h>
@@ -133,7 +134,7 @@ void __init plat_setup(void) 




	_machine_restart = ddb_machine_restart;

	_machine_restart = ddb_machine_restart;

	_machine_halt = ddb_machine_halt;

	_machine_halt = ddb_machine_halt;

	_machine_power_off = ddb_machine_power_off;

	pm_power_off = ddb_machine_power_off;





	/* request io port/mem resources  */

	/* request io port/mem resources  */

	if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) ||

	if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) ||

arch/mips/ddb5xxx/ddb5477/setup.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/major.h>

#include <linux/major.h>

#include <linux/kdev_t.h>

#include <linux/kdev_t.h>

#include <linux/root_dev.h>

#include <linux/root_dev.h>

#include <linux/pm.h>





#include <asm/cpu.h>

#include <asm/cpu.h>

#include <asm/bootinfo.h>

#include <asm/bootinfo.h>
@@ -182,7 +183,7 @@ void __init plat_setup(void) 




	_machine_restart = ddb_machine_restart;

	_machine_restart = ddb_machine_restart;

	_machine_halt = ddb_machine_halt;

	_machine_halt = ddb_machine_halt;

	_machine_power_off = ddb_machine_power_off;

	pm_power_off = ddb_machine_power_off;





	/* setup resource limits */

	/* setup resource limits */

	ioport_resource.end = DDB_PCI0_IO_SIZE + DDB_PCI1_IO_SIZE - 1;

	ioport_resource.end = DDB_PCI0_IO_SIZE + DDB_PCI1_IO_SIZE - 1;