--- mozilla/xpcom/glue/arm.h
+++ mozilla/xpcom/glue/arm.h	2012-05-23 16:36:32.042201721 +0200
@@ -148,7 +148,7 @@
 #if defined(MOZILLA_PRESUME_EDSP)
 #  define MOZILLA_MAY_SUPPORT_EDSP 1
   inline bool supports_edsp() { return true; }
-#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \
+#elif 0 \
    && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
   inline bool supports_edsp() { return arm_private::edsp_enabled; }
 #else