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

Commit a465c94e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-ci-v4.19-rc1' of... 

Merge tag 'usb-ci-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

One patch to enable USB Ethernet gadget at Tegra platforms
parents 668aee26 ba0ab35a

drivers/usb/chipidea/ci_hdrc_tegra.c

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ static const struct tegra_udc_soc_info tegra30_udc_soc_info = { 
};



static const struct tegra_udc_soc_info tegra114_udc_soc_info = {

	.flags = 0,

	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA,

};



static const struct tegra_udc_soc_info tegra124_udc_soc_info = {

	.flags = 0,

	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA,

};



static const struct of_device_id tegra_udc_of_match[] = {