staging: ION: remove some references to CONFIG_ION
With commite722a295cf
("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:e722a295cf
("staging: ion: remove from the tree") Cc: Hridya Valsaraju <hridya@google.com> Cc: Rob Herring <robh@kernel.org> Cc: linux-media@vger.kernel.org Cc: devel@driverdev.osuosl.org Signed-off-by: Matthias Maennich <maennich@google.com> Link: https://lore.kernel.org/r/20210106155201.2845319-1-maennich@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d887d6104a
commit
00b8c557d0
|
@ -1062,26 +1062,6 @@ static const struct v4l2_ctrl_config ctrl_select_isp_version = {
|
|||
.def = 0,
|
||||
};
|
||||
|
||||
#if 0 /* #ifdef CONFIG_ION */
|
||||
/*
|
||||
* Control for ISP ion device fd
|
||||
*
|
||||
* userspace will open ion device and pass the fd to kernel.
|
||||
* this fd will be used to map shared fd to buffer.
|
||||
*/
|
||||
/* V4L2_CID_ATOMISP_ION_DEVICE_FD is not defined */
|
||||
static const struct v4l2_ctrl_config ctrl_ion_dev_fd = {
|
||||
.ops = &ctrl_ops,
|
||||
.id = V4L2_CID_ATOMISP_ION_DEVICE_FD,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "Ion Device Fd",
|
||||
.min = -1,
|
||||
.max = 1024,
|
||||
.step = 1,
|
||||
.def = ION_FD_UNSET
|
||||
};
|
||||
#endif
|
||||
|
||||
static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,
|
||||
struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type)
|
||||
{
|
||||
|
|
|
@ -81,7 +81,6 @@ CONFIG_INPUT_JOYSTICK=y
|
|||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_TABLET=y
|
||||
CONFIG_INPUT_UINPUT=y
|
||||
CONFIG_ION=y
|
||||
CONFIG_JOYSTICK_XPAD=y
|
||||
CONFIG_JOYSTICK_XPAD_FF=y
|
||||
CONFIG_JOYSTICK_XPAD_LEDS=y
|
||||
|
|
Loading…
Reference in New Issue