Merge pull request #3 from SteveGotthardt/main

remove conflicting choice in USB gadget choice

Author: TheRemote

OrangePiRDA/kernel/arch/arm/configs/i96_linux_defconfig

@@ -2497,7 +2497,7 @@ CONFIG_USB_U_SERIAL=y
 # CONFIG_USB_ETH is not set
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_GADGETFS is not set
-CONFIG_USB_FUNCTIONFS=y
+# CONFIG_USB_FUNCTIONFS is not set
 # CONFIG_USB_MASS_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set