diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 02:54:45 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 02:54:45 +0300 |
| commit | 245f0db0de926601353776085e6f6a4c974c5615 (patch) | |
| tree | b493e9e726f4a898041f7861d0df328aa1a348a1 /arch/arm/mach-pxa/pxa25x.c | |
| parent | 24672bdfb357b91bed0ea8d432241bf7bdefc8a8 (diff) | |
| parent | b562e44f507e863c6792946e4e1b1449fbbac85d (diff) | |
| download | linux-245f0db0de926601353776085e6f6a4c974c5615.tar.xz | |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 1dc85ffc3e20..a177bf45feef 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -30,9 +30,9 @@ #include <asm/suspend.h> #include <mach/hardware.h> #include <mach/irqs.h> -#include <mach/pxa25x.h> +#include "pxa25x.h" #include <mach/reset.h> -#include <mach/pm.h> +#include "pm.h" #include <mach/dma.h> #include <mach/smemc.h> |