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

Commit 0592c218 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.10/fixes-for-merge-window' of... 

Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup

From Tony Lindgren <tony@atomide.com>:

An urgent fix for a timer mismerge for and a regression fix for
musb device naming change.

* tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP4: change the device names in usb_bind_phy
  ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 442a33eb 08a48be3

arch/arm/mach-omap2/board-4430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static void __init omap_4430sdp_init(void) 
	omap4_sdp4430_wifi_init();

	omap4_twl6030_hsmmc_init(mmc);



	usb_bind_phy("musb-hdrc.0.auto", 0, "omap-usb2.1.auto");

	usb_bind_phy("musb-hdrc.2.auto", 0, "omap-usb2.3.auto");

	usb_musb_init(&musb_board_data);



	status = omap_ethernet_init();

arch/arm/mach-omap2/board-omap4panda.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static void __init omap4_panda_init(void) 
	omap_sdrc_init(NULL, NULL);

	omap4_twl6030_hsmmc_init(mmc);

	omap4_ehci_init();

	usb_bind_phy("musb-hdrc.0.auto", 0, "omap-usb2.1.auto");

	usb_bind_phy("musb-hdrc.2.auto", 0, "omap-usb2.3.auto");

	usb_musb_init(&musb_board_data);

	omap4_panda_display_init();

}