From 515cade9055cde34f53f1a055fe4736cce141cad Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 28 Feb 2012 10:35:06 +0100
Subject: [PATCH] --- yaml --- r: 297743 b: refs/heads/master c:
 8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b h: refs/heads/master i:   297741:
 4429283e5df458aa1d63ae0b2ab6ca5bfceb7e42   297739:
 be2aa21177ed9f83881fe409f46009a031e8cdd9   297735:
 fff49b029c21e3d864966d887a7adcf648852952   297727:
 0ae27b2cc9d1462b9efd65358abcdc884c96833a v: v3

---
 [refs]                  |  2 +-
 trunk/arch/x86/Makefile | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index db916647ab58..c3a39f90939d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf6276392e990dd0da0ccd8e10f42597d503f29
+refs/heads/master: 8bd69c2d5f9c0b5237c632d1b21dbfe4fd16ba6b
diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile
index 31bb1eb1216a..968dbe24a255 100644
--- a/trunk/arch/x86/Makefile
+++ b/trunk/arch/x86/Makefile
@@ -88,13 +88,13 @@ ifdef CONFIG_X86_X32
 			$(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" - && \
 			$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
 			$(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
-	ifeq ($(x32_ld_ok),y)
-		CONFIG_X86_X32_ABI := y
-		KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
-		KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
-	else
-		$(warning CONFIG_X86_X32 enabled but no binutils support)
-	endif
+        ifeq ($(x32_ld_ok),y)
+                CONFIG_X86_X32_ABI := y
+                KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
+                KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
+        else
+                $(warning CONFIG_X86_X32 enabled but no binutils support)
+        endif
 endif
 export CONFIG_X86_X32_ABI