Skip to content

Commit 00b8c55

Browse files
mettigregkh
authored andcommitted
staging: ION: remove some references to CONFIG_ION
With commit e722a29 ("staging: ion: remove from the tree"), ION and its corresponding config CONFIG_ION is gone. Remove stale references from drivers/staging/media/atomisp/pci and from the recommended Android kernel config. Fixes: e722a29 ("staging: ion: remove from the tree") Cc: Hridya Valsaraju <[email protected]> Cc: Rob Herring <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Matthias Maennich <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d887d61 commit 00b8c55

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

drivers/staging/media/atomisp/pci/atomisp_subdev.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,26 +1062,6 @@ static const struct v4l2_ctrl_config ctrl_select_isp_version = {
10621062
.def = 0,
10631063
};
10641064

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-
10851065
static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,
10861066
struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type)
10871067
{

kernel/configs/android-recommended.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ CONFIG_INPUT_JOYSTICK=y
8181
CONFIG_INPUT_MISC=y
8282
CONFIG_INPUT_TABLET=y
8383
CONFIG_INPUT_UINPUT=y
84-
CONFIG_ION=y
8584
CONFIG_JOYSTICK_XPAD=y
8685
CONFIG_JOYSTICK_XPAD_FF=y
8786
CONFIG_JOYSTICK_XPAD_LEDS=y

0 commit comments

Comments
 (0)