diff options
author | Tony Lindgren <tony@atomide.com> | 2016-12-27 10:29:24 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-12-27 10:29:24 -0800 |
commit | 74de7126fc53fff311c5e213f896a56dbabc9149 (patch) | |
tree | 358696d8b4205b3df9f697e4b96fb21b1b86e472 /arch/arm/mach-omap2/Makefile | |
parent | 9a6b6f75d9daa892ae8f6e5ed6ae0ab49b9586cb (diff) | |
parent | 14944934f8ace3cb7c02edfbdfb664577de53365 (diff) | |
download | op-kernel-dev-74de7126fc53fff311c5e213f896a56dbabc9149.zip op-kernel-dev-74de7126fc53fff311c5e213f896a56dbabc9149.tar.gz |
Merge branch 'omap-for-v4.10/legacy' into omap-for-v4.10/fixes
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 4698940..093458b 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -7,7 +7,7 @@ ccflags-y := -I$(srctree)/$(src)/include \ # Common support obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \ - common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ + common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ omap_device.o omap-headsmp.o sram.o drm.o hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ |