Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Kconfig : Remove HAS_IOMEM dependency for Graphics support

The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")'
added the HAS_IOMEM dependecy for "Graphics support". This disabled the
"Graphics support" menu for S390. But if we enable VT layer for S390,
we would also need to enable the dummy console. So let's remove the
HAS_IOMEM dependency.

Move this dependency to sub menu items and console drivers that use
io memory.

Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <6e8ef238162df5be4462126be155975c722e9863.1519315352.git.alifm@linux.vnet.ibm.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Farhan Ali and committed by
Martin Schwidefsky
0a3994f9 5628683c

+7 -4
+4 -1
drivers/video/Kconfig
··· 3 3 # 4 4 5 5 menu "Graphics support" 6 - depends on HAS_IOMEM 6 + 7 + if HAS_IOMEM 7 8 8 9 config HAVE_FB_ATMEL 9 10 bool ··· 36 35 37 36 config HDMI 38 37 bool 38 + 39 + endif # HAS_IOMEM 39 40 40 41 if VT 41 42 source "drivers/video/console/Kconfig"
+3 -3
drivers/video/console/Kconfig
··· 9 9 depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ 10 10 !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ 11 11 (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ 12 - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC 12 + !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM 13 13 default y 14 14 help 15 15 Saying Y here will allow you to use Linux in text mode through a ··· 85 85 86 86 config SGI_NEWPORT_CONSOLE 87 87 tristate "SGI Newport Console support" 88 - depends on SGI_IP22 88 + depends on SGI_IP22 && HAS_IOMEM 89 89 select FONT_SUPPORT 90 90 help 91 91 Say Y here if you want the console on the Newport aka XL graphics ··· 153 153 154 154 config STI_CONSOLE 155 155 bool "STI text console" 156 - depends on PARISC 156 + depends on PARISC && HAS_IOMEM 157 157 select FONT_SUPPORT 158 158 default y 159 159 help