Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

[firefly-linux-kernel-4.4.55.git] / arch / mips / dec / Makefile

diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile
index 9eb2f9c036aad596584427a5512255aab1769f8b..3d5d2c56de8d3a078877d349f5750040d2793270 100644 (file)
--- a/arch/mips/dec/Makefile
+++ b/arch/mips/dec/Makefile
@@ -5,6 +5,5 @@
 obj-y          := ecc-berr.o int-handler.o ioasic-irq.o kn01-berr.o \
                   kn02-irq.o kn02xa-berr.o reset.o setup.o time.o
 
-obj-$(CONFIG_PROM_CONSOLE)     += promcon.o
 obj-$(CONFIG_TC)               += tc.o
 obj-$(CONFIG_CPU_HAS_WB)       += wbflush.o