CONFIG_FILE_LOCKING should not depend on CONFIG_BLOCK

[sfrench/cifs-2.6.git] / arch / microblaze / Makefile

diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index aaadfa701da30b82475583bde4db5c3bea9cc116..d0bcf80a113659d2b3da42e9cd0e7c4c58f701a9 100644 (file)
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -1,4 +1,8 @@
+ifeq ($(CONFIG_MMU),y)
+UTS_SYSNAME = -DUTS_SYSNAME=\"Linux\"
+else
 UTS_SYSNAME = -DUTS_SYSNAME=\"uClinux\"
+endif
 
 # What CPU vesion are we building for, and crack it open
 # as major.minor.rev
@@ -36,6 +40,8 @@ CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))
 # r31 holds current when in kernel mode
 CFLAGS_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
 
+LDFLAGS                :=
+LDFLAGS_vmlinux        :=
 LDFLAGS_BLOB := --format binary --oformat elf32-microblaze
 
 LIBGCC := $(shell $(CC) $(CFLAGS_KERNEL) -print-libgcc-file-name)