diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 00:54:45 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-16 00:54:45 +0100 |
| commit | 245f0db0de926601353776085e6f6a4c974c5615 (patch) | |
| tree | b493e9e726f4a898041f7861d0df328aa1a348a1 /arch/arm/mach-pxa/pxa320.h | |
| parent | Input: synaptics-rmi4 - using logical instead of bitwise AND (diff) | |
| parent | Linux 4.5 (diff) | |
| download | linux-245f0db0de926601353776085e6f6a4c974c5615.tar.xz linux-245f0db0de926601353776085e6f6a4c974c5615.zip | |
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/pxa320.h')
| -rw-r--r-- | arch/arm/mach-pxa/pxa320.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa320.h b/arch/arm/mach-pxa/pxa320.h new file mode 100644 index 000000000000..b9e5115a1c30 --- /dev/null +++ b/arch/arm/mach-pxa/pxa320.h @@ -0,0 +1,8 @@ +#ifndef __MACH_PXA320_H +#define __MACH_PXA320_H + +#include "pxa3xx.h" +#include "mfp-pxa320.h" + +#endif /* __MACH_PXA320_H */ + |