diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 10:53:49 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 10:53:49 +0100 |
| commit | e7f274dccf7f18a58b86aa8cbd269cdfbdb08056 (patch) | |
| tree | 2881e777e8b77d5d970f34dfc456354ee8e797c4 /arch/arm/mach-dove/Makefile | |
| parent | d4324ce357fa1b10447ebdfd01a681f12f39384f (diff) | |
| parent | 00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535 (diff) | |
| download | op-kernel-dev-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.zip op-kernel-dev-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.tar.gz | |
Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into next/soc
Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper:
- dove
- move devicetree code from mach-dove/ to mach-mvebu/ :-)
* tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: move DT Dove to MVEBU
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-dove/Makefile')
| -rw-r--r-- | arch/arm/mach-dove/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index cbc5c06..b608a21 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -2,5 +2,4 @@ obj-y += common.o obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o -obj-$(CONFIG_MACH_DOVE_DT) += board-dt.o obj-$(CONFIG_MACH_CM_A510) += cm-a510.o |
