summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-06-13 02:26:34 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-06-20 16:20:44 +0200
commit68651ff6373421fff7452a0fdeed589801a26b6d (patch)
tree42fb9002e0c4bf242302843da03383a67b760b70 /arch/mips
parent368b062509fac95c1e403ae4d2ff25fd4ca151fe (diff)
downloadlinux-stable-68651ff6373421fff7452a0fdeed589801a26b6d.tar.gz
linux-stable-68651ff6373421fff7452a0fdeed589801a26b6d.tar.bz2
linux-stable-68651ff6373421fff7452a0fdeed589801a26b6d.zip
MIPS: Octeon: Fix build error if CONFIG_MTD=n
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/cavium-octeon/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile
index 3595affb9772..e3fd50cc709c 100644
--- a/arch/mips/cavium-octeon/Makefile
+++ b/arch/mips/cavium-octeon/Makefile
@@ -13,10 +13,11 @@ CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt
CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt
obj-y := cpu.o setup.o serial.o octeon-platform.o octeon-irq.o csrc-octeon.o
-obj-y += dma-octeon.o flash_setup.o
+obj-y += dma-octeon.o
obj-y += octeon-memcpy.o
obj-y += executive/
+obj-$(CONFIG_MTD) += flash_setup.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_OCTEON_ILM) += oct_ilm.o