diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-12-27 19:29:24 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-12-27 19:29:24 +0100 |
| commit | 74de7126fc53fff311c5e213f896a56dbabc9149 (patch) | |
| tree | 358696d8b4205b3df9f697e4b96fb21b1b86e472 /arch/arm/mach-omap2/Makefile | |
| parent | ARM: OMAP2+: PRM: Delete an error message for a failed memory allocation (diff) | |
| parent | ARM: OMAP2+: Remove legacy gpio code (diff) | |
| download | linux-74de7126fc53fff311c5e213f896a56dbabc9149.tar.xz linux-74de7126fc53fff311c5e213f896a56dbabc9149.zip | |
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 469894082fea..093458b62c8d 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 \ |