Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 14fca61a9828effbde2c284fbaa3ee22178998e0

Authored by Russell King
Committed by Russell King
1 parent 562aa1d4c6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] Yet more asm/apm-emulation.h stuff 

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

arch/arm/mach-pxa/corgi_pm.c
Diff comments   View file @ 14fca61
... ... @@ -16,7 +16,8 @@
16 16 #include <linux/delay.h>
17 17 #include <linux/interrupt.h>
18 18 #include <linux/platform_device.h>
19   -#include <asm/apm-emulation.h>
  19 +#include <linux/apm-emulation.h>
  20 +
20 21 #include <asm/irq.h>
21 22 #include <asm/mach-types.h>
22 23 #include <asm/hardware.h>
arch/arm/mach-pxa/spitz_pm.c
Diff comments   View file @ 14fca61
... ... @@ -16,7 +16,8 @@
16 16 #include <linux/delay.h>
17 17 #include <linux/interrupt.h>
18 18 #include <linux/platform_device.h>
19   -#include <asm/apm-emulation.h>
  19 +#include <linux/apm-emulation.h>
  20 +
20 21 #include <asm/irq.h>
21 22 #include <asm/mach-types.h>
22 23 #include <asm/hardware.h>