From: Stephen Rothwell Date: Thu, 13 Oct 2011 05:10:26 +0000 (+1100) Subject: Merge remote-tracking branch 'usb/usb-next' X-Git-Tag: next-20111013~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=be734fd2c7b7752b02bd54c6025147eb978d1e41;p=karo-tx-linux.git Merge remote-tracking branch 'usb/usb-next' Conflicts: arch/arm/mach-omap2/Makefile --- be734fd2c7b7752b02bd54c6025147eb978d1e41 diff --cc arch/arm/mach-omap2/Makefile index 512978586b2b,7317a2b39dd1..69ab1c069134 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@@ -216,21 -229,24 +216,17 @@@ obj-$(CONFIG_MACH_OMAP_ZOOM3) += board board-zoom-debugboard.o obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ board-zoom-peripherals.o \ - board-zoom-display.o \ - board-flash.o \ - hsmmc.o -obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ - hsmmc.o + board-zoom-display.o +obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o -obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ - hsmmc.o -obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ - hsmmc.o -obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ - hsmmc.o -obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ - hsmmc.o +obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o +obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o - obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ - omap_phy_internal.o - obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ - omap_phy_internal.o ++obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o ++obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o + - obj-$(CONFIG_MACH_PCM049) += board-omap4pcm049.o \ - omap_phy_internal.o ++obj-$(CONFIG_MACH_PCM049) += board-omap4pcm049.o - obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o \ - omap_phy_internal.o + obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o