]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: unisys: Fix broken build when ARCH=um
authorKen Cox <jkc@redhat.com>
Thu, 9 Jul 2015 17:28:56 +0000 (13:28 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Jul 2015 01:35:55 +0000 (18:35 -0700)
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>
drivers/staging/unisys/Kconfig

index 778f9d05f98a83646604cc98f618af37591af4d5..624abe66c20c25f9685f607273ec6b14c003ea50 100644 (file)
@@ -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---