Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 279975
b: refs/heads/master
c: a1c1cee
h: refs/heads/master
i:
  279973: ec4e97f
  279971: cd3d4be
  279967: 4935e7a
v: v3
  • Loading branch information
Russell King committed Jan 5, 2012
1 parent f7d4fe3 commit 1ef61e6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 764cbcc2e3fa444c205b20b3d7908b06b60716ab
refs/heads/master: a1c1cee9adac4d2ab2d989cf83ada063cbd426d0
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-pnx4008/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,11 @@ void __init pnx4008_map_io(void)
iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc));
}

static void pnx4008_restart(char mode, const char *cmd)
{
soft_restart(0);
}

extern struct sys_timer pnx4008_timer;

MACHINE_START(PNX4008, "Philips PNX4008")
Expand All @@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008")
.init_irq = pnx4008_init_irq,
.init_machine = pnx4008_init,
.timer = &pnx4008_timer,
.restart = pnx4008_restart,
MACHINE_END
5 changes: 0 additions & 5 deletions trunk/arch/arm/mach-pnx4008/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,13 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H

#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>

static void arch_idle(void)
{
cpu_do_idle();
}

static inline void arch_reset(char mode, const char *cmd)
{
soft_restart(0);
}

#endif

0 comments on commit 1ef61e6

Please sign in to comment.