diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-15 08:48:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-15 08:48:29 +0100 |
| commit | 6bb5c8b522b3aa30602e57dcc4b30b6a2b5f31e3 (patch) | |
| tree | 03508bb4ad7b6fc58e1017939f80b6d9a91d809a /init | |
| parent | 127a28d8e9cc8fa4bff6a2fe73b9a645b20c1b34 (diff) | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
Merge 5.12-rc3 into android-mainline
Linux 5.12-rc3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibc683be6a28885f39d477e3f86ec2ecd1a9e7e21
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 1cf9d8beb82d..00b1919b68e3 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -119,8 +119,7 @@ config INIT_ENV_ARG_LIMIT config COMPILE_TEST bool "Compile also drivers which will not load" - depends on !UML && !S390 - 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 |