Subject: [PATCH -next] x86/e820: fix build when ACPI is disabled

From: Randy Dunlap <[email-masked]>
Date: Wed, 12 Jan 2011 12:20:14 -0800

From: Randy Dunlap <[email-masked]>

Fix build error when CONFIG_ACPI is not enabled:

arch/x86/kernel/e820.c:734: error:implicit declaration of function 'suspend_nvs_register'

Signed-off-by: Randy Dunlap <[email-masked]>
---
 include/linux/acpi.h |    5 +++++
 1 file changed, 5 insertions(+)

--- linux-next-20110112.orig/include/linux/acpi.h
+++ linux-next-20110112/include/linux/acpi.h
@@ -360,5 +360,10 @@ static inline int acpi_table_parse(char 
 {
 	return -1;
 }
+
+static inline int suspend_nvs_register(unsigned long a, unsigned long b)
+{
+	return 0;
+}
 #endif	/* !CONFIG_ACPI */
 #endif	/*_LINUX_ACPI_H*/