From: Ken Cox <jkc@redhat.com>
Date: Thu, 9 Jul 2015 17:28:56 +0000 (-0400)
Subject: staging: unisys: Fix broken build when ARCH=um
X-Git-Tag: v4.3-rc1~158^2~663
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2164be191e3d627dd7744b7224daf9ad9495c9af;p=karo-tx-linux.git

staging: unisys: Fix broken build when ARCH=um

When building with ARCH=um you get the following error:

arch/x86/include/asm/cpufeature.h:252:42: error: 'REQUIRED_MASK0'
	undeclared

The Unisys drivers should not be compiled for UML, so this patch addresses
that by adding a dependency to kconfig for !UML.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Tested-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/Kconfig b/drivers/staging/unisys/Kconfig
index 778f9d05f98a..624abe66c20c 100644
--- a/drivers/staging/unisys/Kconfig
+++ b/drivers/staging/unisys/Kconfig
@@ -3,7 +3,7 @@
 #
 menuconfig UNISYSSPAR
 	bool "Unisys SPAR driver support"
-	depends on X86_64
+	depends on X86_64 && !UML
 	select PCI
 	select ACPI
 	---help---