From 2b97479591117cb0406f95a710cf57bd7d1bca41 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 3 Jan 2012 17:12:48 +0000 Subject: ARM: mach-sa1100: fix implicit use of page.h Fixes this build error: arch/arm/mach-sa1100/nanoengine.c:75:11: error: 'PAGE_SHIFT' undeclared here (not in a function) CC: Marcelo Roberto Jimenez Signed-off-by: Bjorn Helgaas Signed-off-by: Russell King --- arch/arm/mach-sa1100/nanoengine.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-sa1100/nanoengine.c') diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c index 032f3881d145..d480438579dd 100644 --- a/arch/arm/mach-sa1100/nanoengine.c +++ b/arch/arm/mach-sa1100/nanoengine.c @@ -19,6 +19,7 @@ #include #include +#include #include #include -- cgit v1.2.3 From d9ca5839fd4b0c820c19401b72962a1d099cb99e Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 10:28:50 +0000 Subject: ARM: restart: sa1100: use new restart hook Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King --- arch/arm/mach-sa1100/nanoengine.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-sa1100/nanoengine.c') diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c index 032f3881d145..ed77f85b9951 100644 --- a/arch/arm/mach-sa1100/nanoengine.c +++ b/arch/arm/mach-sa1100/nanoengine.c @@ -116,4 +116,5 @@ MACHINE_START(NANOENGINE, "BSE nanoEngine") .init_irq = sa1100_init_irq, .timer = &sa1100_timer, .init_machine = nanoengine_init, + .restart = sa11x0_restart, MACHINE_END -- cgit v1.2.3