File tree Expand file tree Collapse file tree 2 files changed +0
-21
lines changed
drivers/staging/media/atomisp/pci Expand file tree Collapse file tree 2 files changed +0
-21
lines changed Original file line number Diff line number Diff line change @@ -1062,26 +1062,6 @@ static const struct v4l2_ctrl_config ctrl_select_isp_version = {
1062
1062
.def = 0 ,
1063
1063
};
1064
1064
1065
- #if 0 /* #ifdef CONFIG_ION */
1066
- /*
1067
- * Control for ISP ion device fd
1068
- *
1069
- * userspace will open ion device and pass the fd to kernel.
1070
- * this fd will be used to map shared fd to buffer.
1071
- */
1072
- /* V4L2_CID_ATOMISP_ION_DEVICE_FD is not defined */
1073
- static const struct v4l2_ctrl_config ctrl_ion_dev_fd = {
1074
- .ops = & ctrl_ops ,
1075
- .id = V4L2_CID_ATOMISP_ION_DEVICE_FD ,
1076
- .type = V4L2_CTRL_TYPE_INTEGER ,
1077
- .name = "Ion Device Fd" ,
1078
- .min = -1 ,
1079
- .max = 1024 ,
1080
- .step = 1 ,
1081
- .def = ION_FD_UNSET
1082
- };
1083
- #endif
1084
-
1085
1065
static void atomisp_init_subdev_pipe (struct atomisp_sub_device * asd ,
1086
1066
struct atomisp_video_pipe * pipe , enum v4l2_buf_type buf_type )
1087
1067
{
Original file line number Diff line number Diff line change @@ -81,7 +81,6 @@ CONFIG_INPUT_JOYSTICK=y
81
81
CONFIG_INPUT_MISC=y
82
82
CONFIG_INPUT_TABLET=y
83
83
CONFIG_INPUT_UINPUT=y
84
- CONFIG_ION=y
85
84
CONFIG_JOYSTICK_XPAD=y
86
85
CONFIG_JOYSTICK_XPAD_FF=y
87
86
CONFIG_JOYSTICK_XPAD_LEDS=y
You can’t perform that action at this time.
0 commit comments