diff options
author | Tony Lindgren <tony@atomide.com> | 2011-01-10 23:23:41 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 23:23:41 +0100 |
commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /arch/arm/mach-omap2/Makefile | |
parent | arm: omap4: pandaboard: turn on PHY reference clock at init (diff) | |
parent | omap3: clocks: Fix build error 'CK_3430ES2' undeclared here (diff) | |
download | linux-274353674dd0337bdeeaee08a9f2047777b07ab0.tar.xz linux-274353674dd0337bdeeaee08a9f2047777b07ab0.zip |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 4ab82f6f15b1..cd7332f50b2d 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -209,9 +209,11 @@ obj-$(CONFIG_MACH_IGEP0030) += board-igep0030.o \ obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ hsmmc.o obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ - hsmmc.o + hsmmc.o \ + omap_phy_internal.o obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ - hsmmc.o + hsmmc.o \ + omap_phy_internal.o obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o |