diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-08 15:01:45 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-08 15:01:45 +0000 |
| commit | ecba3287b4121dcf3ca7607fe71c205913edec06 (patch) | |
| tree | 3e48c8b049d462f739893ce33272ee546ee147db /arch/arm/mach-omap2/Makefile | |
| parent | 13340b2a1ef64891572c10927e5626e2b6a81b64 (diff) | |
| parent | 727e18b429e3badda12d1de74f492bfa363a2e94 (diff) | |
| download | blackbird-op-linux-ecba3287b4121dcf3ca7607fe71c205913edec06.tar.gz blackbird-op-linux-ecba3287b4121dcf3ca7607fe71c205913edec06.zip | |
Merge branch 'cleanup-part-2' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/cleanup
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 adbe82d72d4e..ff1466fbf5c5 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -269,4 +269,4 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o disp-$(CONFIG_OMAP2_DSS) := display.o obj-y += $(disp-m) $(disp-y) -obj-y += common-board-devices.o +obj-y += common-board-devices.o twl-common.o |
