net: convert BUG_TRAP to generic WARN_ON

[linux-2.6-omap-h63xx.git] / include / asm-x86 / srat.h

diff --git a/include/asm-x86/srat.h b/include/asm-x86/srat.h
index f4bba131d0686733a7060f6d4227977fdf6c2588..774c919dc2323cb7ecb85b1350876146414286db 100644 (file)
--- a/include/asm-x86/srat.h
+++ b/include/asm-x86/srat.h
@@ -27,11 +27,13 @@
 #ifndef _ASM_SRAT_H_
 #define _ASM_SRAT_H_
 
-#ifndef CONFIG_ACPI_SRAT
-#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
-#endif
-
+#ifdef CONFIG_ACPI_NUMA
 extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
+#else
+static inline int get_memcfg_from_srat(void)
+{
+       return 0;
+}
+#endif
 
 #endif /* _ASM_SRAT_H_ */