Merge branch 'next' into for-linus

Prepare input updates for 4.16 merge window.

1 files changed, 0 insertions, 24 deletions

diff --git a/include/linux/platform_data/mms114.h b/include/linux/platform_data/mms114.h
deleted file mode 100644
index 5722ebfb2738..000000000000
--- a/include/linux/platform_data/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 */