[PATCH] yet another fix for setup-bus.c/x86 merge