[PATCH xserver] Change include order to avoid conflict with system header

[Adam Jackson]

On Thu, 2016-04-28 at 14:47 +0200, Stefan Dirsch wrote:
> From: Andreas Schwab <schwab at suse.de>
> 
> R_SP is also defined in  on m68k.
> Also remove duplicate definitions.
> 
> Signed-off-by: Andreas Schwab <schwab at suse.de>

remote: I: patch #84260 updated using rev 23dfa017298ceceac818f83779858e490c7757b6.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   aa4e757..23dfa01  master -> master

- ajax