diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:35 +0100 |
| commit | 05261801e9cde103b3c4df843472027c007531da (patch) | |
| tree | 1c138878a228f93e22ec1c8d729ef6915586b587 /arch/arm/mach-imx/include/mach | |
| parent | 6435fb09d8af3aeae7c6f8428f5e7ade15aca6f5 (diff) | |
| parent | 253fb33bb81b0e88bcfa0184ef29206598fbb5d4 (diff) | |
| download | barebox-05261801e9cde103b3c4df843472027c007531da.tar.gz barebox-05261801e9cde103b3c4df843472027c007531da.tar.xz | |
Merge branch 'for-next/input'
Diffstat (limited to 'arch/arm/mach-imx/include/mach')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/devices.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h index 4c07f464c2..45bb0a51ee 100644 --- a/arch/arm/mach-imx/include/mach/devices.h +++ b/arch/arm/mach-imx/include/mach/devices.h @@ -1,6 +1,6 @@ #include <fec.h> -#include <matrix_keypad.h> +#include <input/matrix_keypad.h> #include <i2c/i2c.h> #include <mach/spi.h> #include <mach/imx-nand.h> |