diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 20:37:47 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 20:37:47 +0100 |
| commit | 79b357c2171ab3e52148503f0efa66d64a13413e (patch) | |
| tree | 7f134ef19ae4a882b32da87ce3d3ed9e5134691a /arch/arm/mach-omap2/Makefile | |
| parent | omap1: Delete old defconfigs (diff) | |
| parent | omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx (diff) | |
| download | linux-79b357c2171ab3e52148503f0efa66d64a13413e.tar.xz linux-79b357c2171ab3e52148503f0efa66d64a13413e.zip | |
Merge branch 'devel-gpio' into omap-for-linus
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 ce7b1f017670..fbc87395a025 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ - common.o + common.o gpio.o omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o hwmod-common = omap_hwmod.o \ |