Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/server/drivers More sort. (i.e. fix merge ...



details:   https://anonhg.NetBSD.org/src/rev/9c37ba81b6fb
branches:  trunk
changeset: 766674:9c37ba81b6fb
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jun 29 14:52:18 2011 +0000

description:
More sort. (i.e. fix merge botch)

diffstat:

 external/mit/xorg/server/drivers/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 7a5815933c16 -r 9c37ba81b6fb external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Wed Jun 29 14:49:12 2011 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Wed Jun 29 14:52:18 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.57 2011/06/29 14:49:12 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.58 2011/06/29 14:52:18 tsutsui Exp $
 
 # xf86-input drivers
 
@@ -184,6 +184,11 @@
 #      xf86-video-igs
 .endif # ${MACHINE} == "netwinder"
 
+.if ${MACHINE} == "newsmips"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "newsmips"
+
 .if ${MACHINE} == "ofppc"
 SUBDIR+= \
        xf86-video-ati \
@@ -197,11 +202,6 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "ofppc"
 
-.if ${MACHINE} == "newsmips"
-SUBDIR+= \
-       xf86-video-wsfb
-.endif # ${MACHINE} == "newsmips"
-
 .if ${MACHINE} == "prep"
 SUBDIR+= \
        xf86-video-cirrus \



Home | Main Index | Thread Index | Old Index