summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-02-24 18:59:07 -0800
committerKeith Packard <keithp@keithp.com>2011-02-24 18:59:07 -0800
commit83861595782aaa05907f9cf7b236d50261d404d9 (patch)
tree81c67e3e518ff9c9840563dd35bb59865a2b12d2
parenta1cc0e52b0e8ca40bc1218de553424b2bcb760ef (diff)
parent4102a00962f568b1d34cf72ad524e1cc705b0b1c (diff)
Merge remote branch 'kibi/master'
-rw-r--r--hw/xfree86/common/xf86sbusBus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 8cfac84e0..181c6ab00 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -709,6 +709,6 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
free(promPath);
} else {
- XNFsprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
+ XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
}
}