git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
spitz.c
diff --git
a/arch/arm/mach-pxa/spitz.c
b/arch/arm/mach-pxa/spitz.c
index
0d62d31
..
8c61dda
100644
(file)
--- a/
arch/arm/mach-pxa/spitz.c
+++ b/
arch/arm/mach-pxa/spitz.c
@@
-44,9
+44,7
@@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <mach/pxa-regs.h>
-#include <mach/pxa2xx-regs.h>
-#include <mach/mfp-pxa27x.h>
+#include <mach/pxa27x.h>
#include <mach/pxa27x-udc.h>
#include <mach/reset.h>
#include <mach/i2c.h>
#include <mach/pxa27x-udc.h>
#include <mach/reset.h>
#include <mach/i2c.h>
@@
-709,10
+707,10
@@
static struct platform_device *devices[] __initdata = {
static void spitz_poweroff(void)
{
static void spitz_poweroff(void)
{
- arm_machine_restart('g');
+ arm_machine_restart('g'
, NULL
);
}
}
-static void spitz_restart(char mode)
+static void spitz_restart(char mode
, const char *cmd
)
{
/* Bootloader magic for a reboot */
if((MSC0 & 0xffff0000) == 0x7ff00000)
{
/* Bootloader magic for a reboot */
if((MSC0 & 0xffff0000) == 0x7ff00000)