diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
| commit | f53f292eeaa234615c31a1306babe703fc4263f2 (patch) | |
| tree | 707b0933a20f7dc05495e974243a23b5c9f8c918 /include/linux/input/adxl34x.h | |
| parent | 15b9c359f288b09003cb70f7ed204affc0c6614d (diff) | |
| parent | a9499fa7cd3fd4824a7202d00c766b269fa3bda6 (diff) | |
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/input/adxl34x.h')
| -rw-r--r-- | include/linux/input/adxl34x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/input/adxl34x.h b/include/linux/input/adxl34x.h index 57e01a7cb006..010d98175efa 100644 --- a/include/linux/input/adxl34x.h +++ b/include/linux/input/adxl34x.h | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | #ifndef __LINUX_INPUT_ADXL34X_H__ | 13 | #ifndef __LINUX_INPUT_ADXL34X_H__ |
| 14 | #define __LINUX_INPUT_ADXL34X_H__ | 14 | #define __LINUX_INPUT_ADXL34X_H__ |
| 15 | 15 | ||
| 16 | #include <linux/input.h> | ||
| 17 | |||
| 16 | struct adxl34x_platform_data { | 18 | struct adxl34x_platform_data { |
| 17 | 19 | ||
| 18 | /* | 20 | /* |