[PATCH] Define/use X_ALIGN2() instead of open coding it

[Matt Turner]

jcristau tells me that I shouldn't include misc.h in
kdrive/ephyr/XF86dri.c, so just throw out that hunk.