From a70ec0d136bbb9efb6f4e683d7ebcea00375083b Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Sun, 2 May 2010 20:48:01 +0300 Subject: [PATCH] xfree86: bus: rework xf86PostProbe logic and remove useless log info Signed-off-by: Tiago Vignatti Reviewed-by: Adam Jackson --- hw/xfree86/common/xf86Bus.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index a4df1f240..2296ee892 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -480,21 +480,13 @@ xf86EnterServerState(xf86State state) void xf86PostProbe(void) { - if (fbSlotClaimed) { - if (pciSlotClaimed + if (fbSlotClaimed && (pciSlotClaimed #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) || sbusSlotClaimed #endif - ) { + )) FatalError("Cannot run in framebuffer mode. Please specify busIDs " " for all framebuffer devices\n"); - return; - } else { - xf86Msg(X_INFO,"Running in FRAMEBUFFER Mode\n"); - - return; - } - } } void