diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-22 19:54:12 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-22 19:54:12 +0100 |
| commit | 04aa67dec63b61c1a8b9b6d001262250f1a92130 (patch) | |
| tree | 7e0d2cfb30f904ffbd2ac39a055cd53034c873b7 /arch/arm/mach-omap2/Makefile | |
| parent | OMAP4: hwmod data: Prevent timer1 to be reset and idle during init (diff) | |
| parent | OMAP2+: musb: hwmod adaptation for musb registration (diff) | |
| download | linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.tar.xz linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.zip | |
Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index ec24999eefea..ee72a9787bf1 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -218,7 +218,8 @@ obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ hsmmc.o \ omap_phy_internal.o -obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o +obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o \ + omap_phy_internal.o \ obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o |