From f1c04720da1f58c0a6164730fe7240d8b46c9716 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Sun, 10 Jul 2011 12:22:20 +0300 Subject: [PATCH] --- yaml --- r: 264999 b: refs/heads/master c: b3c3dc22366b15350281b1c273adecd2b91e320f h: refs/heads/master i: 264997: d42d4de12d8673bf187d24bdd426671214595a00 264995: 911ba951eae9d369a34428a8766c5be3fead8b90 264991: 125b33192537575136e07c012a5b124011485f1f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/Makefile | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c7a1ba0c2e29..7c7c09c0e57a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c5881d1625d844cdfcc027a970f0d034b982ba5 +refs/heads/master: b3c3dc22366b15350281b1c273adecd2b91e320f diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index f34336560437..7317a2b39dd1 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -242,14 +242,11 @@ obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ hsmmc.o obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ - hsmmc.o \ - omap_phy_internal.o + hsmmc.o obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ - hsmmc.o \ - omap_phy_internal.o + hsmmc.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 @@ -260,6 +257,8 @@ obj-$(CONFIG_MACH_TI8168EVM) += board-ti8168evm.o usbfs-$(CONFIG_ARCH_OMAP_OTG) := usb-fs.o obj-y += $(usbfs-m) $(usbfs-y) obj-y += usb-musb.o +obj-y += omap_phy_internal.o + obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o obj-y += usb-host.o