From 11a45b7d36acf59b22670932fd84f35c2f8743c7 Mon Sep 17 00:00:00 2001
From: Andrew Sutherland <dr3wsuth3rland@gmail.com>
Date: Sat, 7 Jul 2012 02:36:13 -0500
Subject: [PATCH] Revert "kbuild: add scorpion build flags"

This reverts commit 0a76aa497b3bf83eb42f30dafc28ecf96ccd45c1.
---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 5384539f88bf..0c6ab694aa68 100644
--- a/Makefile
+++ b/Makefile
@@ -341,12 +341,11 @@ CHECK		= sparse
 
 CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
 		  -Wbitwise -Wno-return-void $(CF)
-SCORPION_FLAGS	= -march=armv7-a -mfpu=neon -ffast-math
-CFLAGS_MODULE	= -DMODULE $(SCORPION_FLAGS)
-AFLAGS_MODULE	= -DMODULE $(SCORPION_FLAGS)
-LDFLAGS_MODULE	= -T $(srctree)/scripts/module-common.lds
-CFLAGS_KERNEL	= $(SCORPION_FLAGS)
-AFLAGS_KERNEL	= $(SCORPION_FLAGS)
+CFLAGS_MODULE   =
+AFLAGS_MODULE   =
+LDFLAGS_MODULE  =
+CFLAGS_KERNEL	=
+AFLAGS_KERNEL	=
 CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage