Skip to content

Commit 536a82d

Browse files
niklas88hdeller
authored andcommitted
fbdev: add HAS_IOPORT dependencies
In a future patch HAS_IOPORT=n will disable inb()/outb() and friends at compile time. We thus need to add HAS_IOPORT as dependency for those drivers using them. Co-developed-by: Arnd Bergmann <arnd@kernel.org> Signed-off-by: Arnd Bergmann <arnd@kernel.org> Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 51084f8 commit 536a82d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

drivers/video/fbdev/Kconfig

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ config FB_IMX
157157

158158
config FB_CYBER2000
159159
tristate "CyberPro 2000/2010/5000 support"
160-
depends on FB && PCI && (BROKEN || !SPARC64)
160+
depends on FB && PCI && HAS_IOPORT && (BROKEN || !SPARC64)
161161
select FB_IOMEM_HELPERS
162162
help
163163
This enables support for the Integraphics CyberPro 20x0 and 5000
@@ -245,7 +245,7 @@ config FB_FM2
245245

246246
config FB_ARC
247247
tristate "Arc Monochrome LCD board support"
248-
depends on FB && (X86 || COMPILE_TEST)
248+
depends on FB && HAS_IOPORT && (X86 || COMPILE_TEST)
249249
select FB_SYSMEM_HELPERS_DEFERRED
250250
help
251251
This enables support for the Arc Monochrome LCD board. The board
@@ -1043,7 +1043,7 @@ config FB_ATY_BACKLIGHT
10431043

10441044
config FB_S3
10451045
tristate "S3 Trio/Virge support"
1046-
depends on FB && PCI
1046+
depends on FB && PCI && HAS_IOPORT
10471047
select FB_CFB_FILLRECT
10481048
select FB_CFB_COPYAREA
10491049
select FB_CFB_IMAGEBLIT
@@ -1104,7 +1104,7 @@ config FB_SAVAGE_ACCEL
11041104

11051105
config FB_SIS
11061106
tristate "SiS/XGI display support"
1107-
depends on FB && PCI
1107+
depends on FB && PCI && HAS_IOPORT
11081108
select BOOT_VESA_SUPPORT if FB_SIS = y
11091109
select FB_CFB_FILLRECT
11101110
select FB_CFB_COPYAREA
@@ -1135,7 +1135,7 @@ config FB_SIS_315
11351135

11361136
config FB_VIA
11371137
tristate "VIA UniChrome (Pro) and Chrome9 display support"
1138-
depends on FB && PCI && GPIOLIB && I2C && (X86 || COMPILE_TEST)
1138+
depends on FB && PCI && GPIOLIB && I2C && HAS_IOPORT && (X86 || COMPILE_TEST)
11391139
select FB_CFB_FILLRECT
11401140
select FB_CFB_COPYAREA
11411141
select FB_CFB_IMAGEBLIT
@@ -1174,7 +1174,7 @@ endif
11741174

11751175
config FB_NEOMAGIC
11761176
tristate "NeoMagic display support"
1177-
depends on FB && PCI
1177+
depends on FB && PCI && HAS_IOPORT
11781178
select FB_CFB_FILLRECT
11791179
select FB_CFB_COPYAREA
11801180
select FB_CFB_IMAGEBLIT
@@ -1201,7 +1201,7 @@ config FB_KYRO
12011201

12021202
config FB_3DFX
12031203
tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"
1204-
depends on FB && PCI
1204+
depends on FB && PCI && HAS_IOPORT
12051205
select FB_CFB_FILLRECT
12061206
select FB_CFB_COPYAREA
12071207
select FB_CFB_IMAGEBLIT
@@ -1249,7 +1249,7 @@ config FB_VOODOO1
12491249

12501250
config FB_VT8623
12511251
tristate "VIA VT8623 support"
1252-
depends on FB && PCI
1252+
depends on FB && PCI && HAS_IOPORT
12531253
select FB_CFB_FILLRECT
12541254
select FB_CFB_COPYAREA
12551255
select FB_CFB_IMAGEBLIT
@@ -1264,7 +1264,7 @@ config FB_VT8623
12641264

12651265
config FB_TRIDENT
12661266
tristate "Trident/CyberXXX/CyberBlade support"
1267-
depends on FB && PCI
1267+
depends on FB && PCI && HAS_IOPORT
12681268
select FB_CFB_FILLRECT
12691269
select FB_CFB_COPYAREA
12701270
select FB_CFB_IMAGEBLIT
@@ -1287,7 +1287,7 @@ config FB_TRIDENT
12871287

12881288
config FB_ARK
12891289
tristate "ARK 2000PV support"
1290-
depends on FB && PCI
1290+
depends on FB && PCI && HAS_IOPORT
12911291
select FB_CFB_FILLRECT
12921292
select FB_CFB_COPYAREA
12931293
select FB_CFB_IMAGEBLIT
@@ -1811,7 +1811,7 @@ config FB_SSD1307
18111811

18121812
config FB_SM712
18131813
tristate "Silicon Motion SM712 framebuffer support"
1814-
depends on FB && PCI
1814+
depends on FB && PCI && HAS_IOPORT
18151815
select FB_IOMEM_HELPERS
18161816
help
18171817
Frame buffer driver for the Silicon Motion SM710, SM712, SM721

0 commit comments

Comments
 (0)