Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ccf4f4f authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

usb: gadget: Remove circular dependency on Config 



drivers/usb/gadget/Kconfig:208:error: recursive dependency detected!
drivers/usb/gadget/Kconfig:208: choice <choice> contains symbol
USB_CONFIGFS_F_MIDI
drivers/usb/gadget/Kconfig:434: symbol USB_CONFIGFS_F_MIDI depends on
USB_CONFIGFS
drivers/usb/gadget/Kconfig:229: symbol USB_CONFIGFS is part of choice <choice>

BUG: 24606128

Signed-off-by: default avatarBadhri Jagan Sridharan <badhri@google.com>
Change-Id: I70a1bbca4ff7371a4d3a50285673a0845dbdcb10
parent 015b66b6

drivers/usb/gadget/Kconfig

+13 −14
Original line number Diff line number Diff line
@@ -413,6 +413,19 @@ config USB_CONFIGFS_UEVENT 
	  state changes. The gadget can be in any of the following

	  three states: "CONNECTED/DISCONNECTED/CONFIGURED"



config USB_CONFIGFS_F_MIDI

        boolean "MIDI function"

        depends on USB_CONFIGFS

        depends on SND

        select SND_RAWMIDI

        select USB_F_MIDI

        help

          The MIDI Function acts as a USB Audio device, with one MIDI

          input and one MIDI output. These MIDI jacks appear as

          a sound "card" in the ALSA sound system. Other MIDI

          connections can then be made on the gadget system, using

          ALSA's aconnect utility etc.



config USB_G_ANDROID

	boolean "Android Composite Gadget"

	select USB_F_ACM
@@ -431,20 +444,6 @@ config USB_ANDROID_RNDIS_DWORD_ALIGNED 
	help

		Provides dword aligned for DMA controller.



config USB_CONFIGFS_F_MIDI

	boolean "MIDI function"

	depends on USB_CONFIGFS

	depends on SND

	select USB_LIBCOMPOSITE

	select SND_RAWMIDI

	select USB_F_MIDI

	help

	  The MIDI Function acts as a USB Audio device, with one MIDI

	  input and one MIDI output. These MIDI jacks appear as

	  a sound "card" in the ALSA sound system. Other MIDI

	  connections can then be made on the gadget system, using

	  ALSA's aconnect utility etc.



source "drivers/usb/gadget/legacy/Kconfig"



endchoice