summaryrefslogtreecommitdiff
path: root/include/linux/i2c/mms114.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-07-06 13:51:43 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-07-06 13:51:43 -0700
commitede2e7cdc58e1847cc73bd26b88a634631a43112 (patch)
treef4582f9dc0f4ec8c06975017e036479805d77a4b /include/linux/i2c/mms114.h
parent9768935264c4f0e4afd788a185d8e8d89c28e41d (diff)
parent65938133784a3092c61b00aa63d1830fb465c1ac (diff)
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
Diffstat (limited to 'include/linux/i2c/mms114.h')
-rw-r--r--include/linux/i2c/mms114.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/i2c/mms114.h b/include/linux/i2c/mms114.h
deleted file mode 100644
index 5722ebfb2738..000000000000
--- a/include/linux/i2c/mms114.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundationr
- */
-
-#ifndef __LINUX_MMS114_H
-#define __LINUX_MMS114_H
-
-struct mms114_platform_data {
- unsigned int x_size;
- unsigned int y_size;
- unsigned int contact_threshold;
- unsigned int moving_threshold;
- bool x_invert;
- bool y_invert;
-
- void (*cfg_pin)(bool);
-};
-
-#endif /* __LINUX_MMS114_H */