Revert "Post-merge fix: fix build error."
to facilitate upcoming merge of OpenBSD -current changes.

This reverts commit 0ba2c9bb652f750d6a4e13ef841f566d9cf30eb3.
Manual merge of OpenBSD -current changes, Xenocara xf86-video-intel part, with:

git diff cff7cf84~..cff7cf84 openbsd/xenocara/driver/xf86-video-intel | \
    patch -d xsrc/external/mit/xf86-video-intel/dist -p5