fixup!

bachnxuan · Mar 1, 2025 · 981f02a · 981f02a
1 parent 5cb5b09
commit 981f02a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/drivers/Kconfig b/drivers/Kconfig
@@ -241,4 +241,4 @@ source "drivers/most/Kconfig"
 source "drivers/kernelsu/Kconfig"
 
 source "drivers/p73-spi/Kconfig"
-
+endmenu
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
@@ -290,7 +290,6 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 
 		v4l2_event_queue(&uvc->vdev, &v4l2_event);
 	}
->>>>>>> 9586237b6ff6 (FROMLIST: usb: gadget: uvc: enqueue usb request in setup handler for control OUT)
 
 	return 0;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -241,4 +241,4 @@ source "drivers/most/Kconfig"
		source "drivers/kernelsu/Kconfig"

		source "drivers/p73-spi/Kconfig"

		endmenu
-Original file line number
+Diff line change
@@ Expand Up @@
     		v4l2_event_queue(&uvc->vdev, &v4l2_event);
     	}
-    >>>>>>> 9586237b6ff6 (FROMLIST: usb: gadget: uvc: enqueue usb request in setup handler for control OUT)
     	return 0;
     }
@@ Expand Down @@