Skip to content

Commit 2662c7a

Browse files
jmberg-intelhdeller
authored andcommitted
fbdev: nvidiafb: fix build on 32-bit ARCH=um
Now that ARCH=um no longer has IO port accesses, this driver can no longer build as-is. Make the IO port calls not just conditional on i386 but also !UML. Reported-by: Arnd Bergmann <[email protected]> Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent 89be9a8 commit 2662c7a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/video/fbdev/nvidia/nv_local.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
(par)->dmaFree -= ((size) + 1); \
8181
}
8282

83-
#if defined(__i386__)
83+
#if defined(__i386__) && !defined(CONFIG_UML)
8484
#define _NV_FENCE() outb(0, 0x3D0);
8585
#else
8686
#define _NV_FENCE() mb();

0 commit comments

Comments
 (0)