diff options
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 5c63d25ce84e..d530aade0103 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c | |||
| @@ -261,16 +261,6 @@ enum v4l_dbg_inputs { | |||
| 261 | MXT_V4L_INPUT_MAX, | 261 | MXT_V4L_INPUT_MAX, |
| 262 | }; | 262 | }; |
| 263 | 263 | ||
| 264 | static const struct v4l2_file_operations mxt_video_fops = { | ||
| 265 | .owner = THIS_MODULE, | ||
| 266 | .open = v4l2_fh_open, | ||
| 267 | .release = vb2_fop_release, | ||
| 268 | .unlocked_ioctl = video_ioctl2, | ||
| 269 | .read = vb2_fop_read, | ||
| 270 | .mmap = vb2_fop_mmap, | ||
| 271 | .poll = vb2_fop_poll, | ||
| 272 | }; | ||
| 273 | |||
| 274 | enum mxt_suspend_mode { | 264 | enum mxt_suspend_mode { |
| 275 | MXT_SUSPEND_DEEP_SLEEP = 0, | 265 | MXT_SUSPEND_DEEP_SLEEP = 0, |
| 276 | MXT_SUSPEND_T9_CTRL = 1, | 266 | MXT_SUSPEND_T9_CTRL = 1, |
| @@ -2223,6 +2213,16 @@ recheck: | |||
| 2223 | } | 2213 | } |
| 2224 | 2214 | ||
| 2225 | #ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 | 2215 | #ifdef CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 |
| 2216 | static const struct v4l2_file_operations mxt_video_fops = { | ||
| 2217 | .owner = THIS_MODULE, | ||
| 2218 | .open = v4l2_fh_open, | ||
| 2219 | .release = vb2_fop_release, | ||
| 2220 | .unlocked_ioctl = video_ioctl2, | ||
| 2221 | .read = vb2_fop_read, | ||
| 2222 | .mmap = vb2_fop_mmap, | ||
| 2223 | .poll = vb2_fop_poll, | ||
| 2224 | }; | ||
| 2225 | |||
| 2226 | static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x, | 2226 | static u16 mxt_get_debug_value(struct mxt_data *data, unsigned int x, |
| 2227 | unsigned int y) | 2227 | unsigned int y) |
| 2228 | { | 2228 | { |
