summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-04-10 14:15:42 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2021-04-10 14:15:42 +0200
commit7368be9e243a12ab63d8f91e95072bd8154e5384 (patch)
tree3ebf8d9972b5bde82ff920a1aa013543e37d595e /init
parent843d2d2be35bb2a056472110dd6544a8b990eb33 (diff)
parent958e517f4e16952e9a2e2d58fd32d28ae4e23dda (diff)
Merge 4.14.230 into android-4.14-stable
Changes in 4.14.230 ARM: dts: am33xx: add aliases for mmc interfaces net: pxa168_eth: Fix a potential data race in pxa168_eth_remove mISDN: fix crash in fritzpci mac80211: choose first enabled channel for monitor drm/msm: Ratelimit invalid-fence message platform/x86: thinkpad_acpi: Allow the FnLock LED to change state x86/build: Turn off -fcf-protection for realmode targets scsi: target: pscsi: Clean up after failure in pscsi_map_sg() ia64: mca: allocate early mca with GFP_ATOMIC cifs: revalidate mapping when we open files for SMB1 POSIX cifs: Silently ignore unknown oplock break handle bpf, x86: Validate computation of branch displacements for x86-64 init/Kconfig: make COMPILE_TEST depend on !S390 init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate Linux 4.14.230 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6475dfba7ab1e2993c67db7564a45c7e694ba339
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 7c14c91c9758..b9cb8854586b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -71,8 +71,7 @@ config CROSS_COMPILE
config COMPILE_TEST
bool "Compile also drivers which will not load"
- depends on !UML
- default n
+ depends on HAS_IOMEM
help
Some drivers can be compiled on a different platform than they are
intended to be run on. Despite they cannot be loaded there (or even