diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /hw/dmx | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
Diffstat (limited to 'hw/dmx')
115 files changed, 1 insertions, 116 deletions
diff --git a/hw/dmx/config/Canvas.c b/hw/dmx/config/Canvas.c index 4dccd7382..c2eba876a 100644 --- a/hw/dmx/config/Canvas.c +++ b/hw/dmx/config/Canvas.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 1987, 1998 The Open Group * diff --git a/hw/dmx/config/Canvas.h b/hw/dmx/config/Canvas.h index a36851a6d..fe9a57f21 100644 --- a/hw/dmx/config/Canvas.h +++ b/hw/dmx/config/Canvas.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright 1987, 1998 The Open Group diff --git a/hw/dmx/config/CanvasP.h b/hw/dmx/config/CanvasP.h index 98f95b94e..cf43710f1 100644 --- a/hw/dmx/config/CanvasP.h +++ b/hw/dmx/config/CanvasP.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright 1987, 1998 The Open Group diff --git a/hw/dmx/config/dmxcompat.c b/hw/dmx/config/dmxcompat.c index 3681e8aa2..b4190ffcc 100644 --- a/hw/dmx/config/dmxcompat.c +++ b/hw/dmx/config/dmxcompat.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxcompat.h b/hw/dmx/config/dmxcompat.h index 416ec7873..718892040 100644 --- a/hw/dmx/config/dmxcompat.h +++ b/hw/dmx/config/dmxcompat.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index 353ce11db..225d89277 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxconfig.h b/hw/dmx/config/dmxconfig.h index b5c0c1f1c..7c9dbc799 100644 --- a/hw/dmx/config/dmxconfig.h +++ b/hw/dmx/config/dmxconfig.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxparse.c b/hw/dmx/config/dmxparse.c index 1acb6d13e..0bf947051 100644 --- a/hw/dmx/config/dmxparse.c +++ b/hw/dmx/config/dmxparse.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxparse.h b/hw/dmx/config/dmxparse.h index 8ea84f4e3..de81d23b7 100644 --- a/hw/dmx/config/dmxparse.h +++ b/hw/dmx/config/dmxparse.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxprint.c b/hw/dmx/config/dmxprint.c index ed3fc213d..599ebf5df 100644 --- a/hw/dmx/config/dmxprint.c +++ b/hw/dmx/config/dmxprint.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxprint.h b/hw/dmx/config/dmxprint.h index b68c29620..d162dea95 100644 --- a/hw/dmx/config/dmxprint.h +++ b/hw/dmx/config/dmxprint.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxtodmx.c b/hw/dmx/config/dmxtodmx.c index 706c49908..0d4ee4c09 100644 --- a/hw/dmx/config/dmxtodmx.c +++ b/hw/dmx/config/dmxtodmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/vdltodmx.c b/hw/dmx/config/vdltodmx.c index 33cd8fe8a..69563f16c 100644 --- a/hw/dmx/config/vdltodmx.c +++ b/hw/dmx/config/vdltodmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c index 9a350a826..033b52512 100644 --- a/hw/dmx/config/xdmxconfig.c +++ b/hw/dmx/config/xdmxconfig.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * @@ -60,7 +59,7 @@ extern int yyparse(void); extern FILE *yyin; -#define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n$Id$" +#define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n" #define DMX_MAIN_WIDTH 800 #define DMX_MAIN_HEIGHT 600 diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index b7c81ee57..24d1620b8 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h index becb2da38..37f42a76f 100644 --- a/hw/dmx/dmx.h +++ b/hw/dmx/dmx.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c index b1f47bde4..2ecfe22a3 100644 --- a/hw/dmx/dmxcb.c +++ b/hw/dmx/dmxcb.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcb.h b/hw/dmx/dmxcb.h index 38ffa5671..fa334dbe8 100644 --- a/hw/dmx/dmxcb.h +++ b/hw/dmx/dmxcb.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h index 657a1275f..8f018d153 100644 --- a/hw/dmx/dmxclient.h +++ b/hw/dmx/dmxclient.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright (c) 1995 X Consortium * Copyright 2004 Red Hat Inc., Durham, North Carolina. diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c index 9a9781f53..949d7d689 100644 --- a/hw/dmx/dmxcmap.c +++ b/hw/dmx/dmxcmap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcmap.h b/hw/dmx/dmxcmap.h index 09039e72b..228f8662e 100644 --- a/hw/dmx/dmxcmap.h +++ b/hw/dmx/dmxcmap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index a7d9378b0..1ad199d58 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcursor.h b/hw/dmx/dmxcursor.h index af076bd1c..7b70c6250 100644 --- a/hw/dmx/dmxcursor.h +++ b/hw/dmx/dmxcursor.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c index 5bcce188d..5c176dfc3 100644 --- a/hw/dmx/dmxdpms.c +++ b/hw/dmx/dmxdpms.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxdpms.h b/hw/dmx/dmxdpms.h index d3fa57d4a..e3eee983a 100644 --- a/hw/dmx/dmxdpms.h +++ b/hw/dmx/dmxdpms.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index c12973bd5..103364446 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxextension.h b/hw/dmx/dmxextension.h index 3ea0b83ec..342d8c593 100644 --- a/hw/dmx/dmxextension.h +++ b/hw/dmx/dmxextension.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 3dba61de4..500b5682a 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxfont.h b/hw/dmx/dmxfont.h index f69aac196..086e71b59 100644 --- a/hw/dmx/dmxfont.h +++ b/hw/dmx/dmxfont.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c index d17b05164..981f64d0a 100644 --- a/hw/dmx/dmxgc.c +++ b/hw/dmx/dmxgc.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgc.h b/hw/dmx/dmxgc.h index 5f54d7dc9..3d49f6735 100644 --- a/hw/dmx/dmxgc.h +++ b/hw/dmx/dmxgc.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c index 75d9dfb73..eaabf16dd 100644 --- a/hw/dmx/dmxgcops.c +++ b/hw/dmx/dmxgcops.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgcops.h b/hw/dmx/dmxgcops.h index 0754c44c1..da14d4d94 100644 --- a/hw/dmx/dmxgcops.h +++ b/hw/dmx/dmxgcops.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 1d3689c40..29dc00575 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxinit.h b/hw/dmx/dmxinit.h index e5bdb9957..7d166fd85 100644 --- a/hw/dmx/dmxinit.h +++ b/hw/dmx/dmxinit.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2004 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c index f47899c2f..d644b5d0d 100644 --- a/hw/dmx/dmxinput.c +++ b/hw/dmx/dmxinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxinput.h b/hw/dmx/dmxinput.h index 3fb587086..8a3ccdcbd 100644 --- a/hw/dmx/dmxinput.h +++ b/hw/dmx/dmxinput.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c index 16d082daa..31a74cdf1 100644 --- a/hw/dmx/dmxlog.c +++ b/hw/dmx/dmxlog.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h index 6b9ec6005..8a5f725c8 100644 --- a/hw/dmx/dmxlog.h +++ b/hw/dmx/dmxlog.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c index 0f1782e51..478542a13 100644 --- a/hw/dmx/dmxpict.c +++ b/hw/dmx/dmxpict.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpict.h b/hw/dmx/dmxpict.h index fe2a65959..c178ef39c 100644 --- a/hw/dmx/dmxpict.h +++ b/hw/dmx/dmxpict.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c index 934060675..40d2d8e56 100644 --- a/hw/dmx/dmxpixmap.c +++ b/hw/dmx/dmxpixmap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpixmap.h b/hw/dmx/dmxpixmap.h index 908d2cb2c..4ecd10fd8 100644 --- a/hw/dmx/dmxpixmap.h +++ b/hw/dmx/dmxpixmap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxprop.c b/hw/dmx/dmxprop.c index 8d9e22a27..376313d8d 100644 --- a/hw/dmx/dmxprop.c +++ b/hw/dmx/dmxprop.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxprop.h b/hw/dmx/dmxprop.h index f0c5afb95..50135cd64 100644 --- a/hw/dmx/dmxprop.h +++ b/hw/dmx/dmxprop.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c index 7c315d89f..8ae448a5e 100644 --- a/hw/dmx/dmxscrinit.c +++ b/hw/dmx/dmxscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxscrinit.h b/hw/dmx/dmxscrinit.h index 91be0948c..46a0a00a4 100644 --- a/hw/dmx/dmxscrinit.h +++ b/hw/dmx/dmxscrinit.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxshadow.c b/hw/dmx/dmxshadow.c index 8d1e147d1..461fd085b 100644 --- a/hw/dmx/dmxshadow.c +++ b/hw/dmx/dmxshadow.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxshadow.h b/hw/dmx/dmxshadow.h index 4ba084c99..cafe87900 100644 --- a/hw/dmx/dmxshadow.h +++ b/hw/dmx/dmxshadow.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c index 3b092b2a8..a89c69eae 100644 --- a/hw/dmx/dmxstat.c +++ b/hw/dmx/dmxstat.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002, 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxstat.h b/hw/dmx/dmxstat.h index 5411272ca..04c88d3c9 100644 --- a/hw/dmx/dmxstat.h +++ b/hw/dmx/dmxstat.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c index 02e244697..c1aa43107 100644 --- a/hw/dmx/dmxsync.c +++ b/hw/dmx/dmxsync.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxsync.h b/hw/dmx/dmxsync.h index 85fd36c07..b80f54af2 100644 --- a/hw/dmx/dmxsync.h +++ b/hw/dmx/dmxsync.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxvisual.c b/hw/dmx/dmxvisual.c index 23ff0acfa..7b8771f9e 100644 --- a/hw/dmx/dmxvisual.c +++ b/hw/dmx/dmxvisual.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxvisual.h b/hw/dmx/dmxvisual.h index 8701bf01f..bcb54cd0e 100644 --- a/hw/dmx/dmxvisual.h +++ b/hw/dmx/dmxvisual.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c index 25456e228..b66f2a3bb 100644 --- a/hw/dmx/dmxwindow.c +++ b/hw/dmx/dmxwindow.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxwindow.h b/hw/dmx/dmxwindow.h index e6302fe3f..f976c7954 100644 --- a/hw/dmx/dmxwindow.h +++ b/hw/dmx/dmxwindow.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxaddinput.c b/hw/dmx/examples/dmxaddinput.c index c391385e9..dcfd4f5cc 100644 --- a/hw/dmx/examples/dmxaddinput.c +++ b/hw/dmx/examples/dmxaddinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003,2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxaddscreen.c b/hw/dmx/examples/dmxaddscreen.c index 5fa008c21..8e60872df 100644 --- a/hw/dmx/examples/dmxaddscreen.c +++ b/hw/dmx/examples/dmxaddscreen.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxreconfig.c b/hw/dmx/examples/dmxreconfig.c index efcead86e..042f8a112 100644 --- a/hw/dmx/examples/dmxreconfig.c +++ b/hw/dmx/examples/dmxreconfig.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxresize.c b/hw/dmx/examples/dmxresize.c index f6fadf70c..caed91d8d 100644 --- a/hw/dmx/examples/dmxresize.c +++ b/hw/dmx/examples/dmxresize.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxrminput.c b/hw/dmx/examples/dmxrminput.c index 3860cc9c6..ef62cab8b 100644 --- a/hw/dmx/examples/dmxrminput.c +++ b/hw/dmx/examples/dmxrminput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003,2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxrmscreen.c b/hw/dmx/examples/dmxrmscreen.c index ab3653d24..fecf0f6c1 100644 --- a/hw/dmx/examples/dmxrmscreen.c +++ b/hw/dmx/examples/dmxrmscreen.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxwininfo.c b/hw/dmx/examples/dmxwininfo.c index bbf7f7446..6cf1d411e 100644 --- a/hw/dmx/examples/dmxwininfo.c +++ b/hw/dmx/examples/dmxwininfo.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright (c) 2003 by the XFree86 Project, Inc. * diff --git a/hw/dmx/examples/ev.c b/hw/dmx/examples/ev.c index 04c47eb11..10912266d 100644 --- a/hw/dmx/examples/ev.c +++ b/hw/dmx/examples/ev.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/evi.c b/hw/dmx/examples/evi.c index 14af95d5a..644ea8f51 100644 --- a/hw/dmx/examples/evi.c +++ b/hw/dmx/examples/evi.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/res.c b/hw/dmx/examples/res.c index 3af5541fa..901a1958b 100644 --- a/hw/dmx/examples/res.c +++ b/hw/dmx/examples/res.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xbell.c b/hw/dmx/examples/xbell.c index 4d55740a8..f3e3be1b8 100644 --- a/hw/dmx/examples/xbell.c +++ b/hw/dmx/examples/xbell.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xdmx.c b/hw/dmx/examples/xdmx.c index 3fec7dd3d..dedce6e8d 100644 --- a/hw/dmx/examples/xdmx.c +++ b/hw/dmx/examples/xdmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c index c2b9bc0f4..74353a93b 100644 --- a/hw/dmx/examples/xinput.c +++ b/hw/dmx/examples/xinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xled.c b/hw/dmx/examples/xled.c index cb4bcb1ac..270f80511 100644 --- a/hw/dmx/examples/xled.c +++ b/hw/dmx/examples/xled.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xtest.c b/hw/dmx/examples/xtest.c index b6f223d27..1e2d1cfff 100644 --- a/hw/dmx/examples/xtest.c +++ b/hw/dmx/examples/xtest.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/glxProxy/glxswap.c b/hw/dmx/glxProxy/glxswap.c index f7fcc37ac..8fa04f877 100644 --- a/hw/dmx/glxProxy/glxswap.c +++ b/hw/dmx/glxProxy/glxswap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/glxProxy/glxswap.h b/hw/dmx/glxProxy/glxswap.h index 95c433381..08e38df7b 100644 --- a/hw/dmx/glxProxy/glxswap.h +++ b/hw/dmx/glxProxy/glxswap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/input/ChkNotMaskEv.c b/hw/dmx/input/ChkNotMaskEv.c index 220e1de39..fdc67a889 100644 --- a/hw/dmx/input/ChkNotMaskEv.c +++ b/hw/dmx/input/ChkNotMaskEv.c @@ -1,4 +1,3 @@ -/* Derived from Xorg: ChkMaskEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp */ /* * Copyright 1985, 1987, 1998 The Open Group * diff --git a/hw/dmx/input/ChkNotMaskEv.h b/hw/dmx/input/ChkNotMaskEv.h index 777d3a28a..f79075e1d 100644 --- a/hw/dmx/input/ChkNotMaskEv.h +++ b/hw/dmx/input/ChkNotMaskEv.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxarg.c b/hw/dmx/input/dmxarg.c index 8708fa009..49a1da9af 100644 --- a/hw/dmx/input/dmxarg.c +++ b/hw/dmx/input/dmxarg.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxarg.h b/hw/dmx/input/dmxarg.h index b377aca70..ca76f9272 100644 --- a/hw/dmx/input/dmxarg.h +++ b/hw/dmx/input/dmxarg.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c index 7aa8510cb..b1791098a 100644 --- a/hw/dmx/input/dmxbackend.c +++ b/hw/dmx/input/dmxbackend.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxbackend.h b/hw/dmx/input/dmxbackend.h index 64a65f4a6..ee78f0014 100644 --- a/hw/dmx/input/dmxbackend.h +++ b/hw/dmx/input/dmxbackend.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c index 1dcc1e9e4..e77bb7918 100644 --- a/hw/dmx/input/dmxcommon.c +++ b/hw/dmx/input/dmxcommon.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxcommon.h b/hw/dmx/input/dmxcommon.h index 4b8b07d9f..1cc935d0b 100644 --- a/hw/dmx/input/dmxcommon.h +++ b/hw/dmx/input/dmxcommon.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c index aac5e08dc..cc820a204 100644 --- a/hw/dmx/input/dmxconsole.c +++ b/hw/dmx/input/dmxconsole.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxconsole.h b/hw/dmx/input/dmxconsole.h index 85516fb5b..cd545d39b 100644 --- a/hw/dmx/input/dmxconsole.h +++ b/hw/dmx/input/dmxconsole.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxdetach.c b/hw/dmx/input/dmxdetach.c index d2e6b652f..cc2250683 100644 --- a/hw/dmx/input/dmxdetach.c +++ b/hw/dmx/input/dmxdetach.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2004 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/input/dmxdummy.c b/hw/dmx/input/dmxdummy.c index b9c72b015..2afe2580d 100644 --- a/hw/dmx/input/dmxdummy.c +++ b/hw/dmx/input/dmxdummy.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxdummy.h b/hw/dmx/input/dmxdummy.h index 1f20a38cb..e3a85be95 100644 --- a/hw/dmx/input/dmxdummy.h +++ b/hw/dmx/input/dmxdummy.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index a2fb07f1e..3e98fb799 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * * Copyright 1990, 1998 The Open Group diff --git a/hw/dmx/input/dmxeq.h b/hw/dmx/input/dmxeq.h index 64d15f7e8..b38c519df 100644 --- a/hw/dmx/input/dmxeq.h +++ b/hw/dmx/input/dmxeq.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 4810b17bb..26dc067dc 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxevents.h b/hw/dmx/input/dmxevents.h index f8d29d440..fe8712ebe 100644 --- a/hw/dmx/input/dmxevents.h +++ b/hw/dmx/input/dmxevents.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index a9d902ec2..fd4eeaacb 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h index c593e267a..6f491edf9 100644 --- a/hw/dmx/input/dmxinputinit.h +++ b/hw/dmx/input/dmxinputinit.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmap.c b/hw/dmx/input/dmxmap.c index cf1be5853..1eccd3d28 100644 --- a/hw/dmx/input/dmxmap.c +++ b/hw/dmx/input/dmxmap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmap.h b/hw/dmx/input/dmxmap.h index 662955636..aad30d1bd 100644 --- a/hw/dmx/input/dmxmap.h +++ b/hw/dmx/input/dmxmap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmotion.c b/hw/dmx/input/dmxmotion.c index 7b47c4562..cc55eedff 100644 --- a/hw/dmx/input/dmxmotion.c +++ b/hw/dmx/input/dmxmotion.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmotion.h b/hw/dmx/input/dmxmotion.h index 2928f5f2a..88aeb3d09 100644 --- a/hw/dmx/input/dmxmotion.h +++ b/hw/dmx/input/dmxmotion.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxsigio.c b/hw/dmx/input/dmxsigio.c index 840b56641..03c3070d7 100644 --- a/hw/dmx/input/dmxsigio.c +++ b/hw/dmx/input/dmxsigio.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxsigio.h b/hw/dmx/input/dmxsigio.h index 869dd6bdf..83f8060ae 100644 --- a/hw/dmx/input/dmxsigio.h +++ b/hw/dmx/input/dmxsigio.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c index ad2a77c9c..97bea7596 100644 --- a/hw/dmx/input/dmxxinput.c +++ b/hw/dmx/input/dmxxinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c index b09492b89..42a807b11 100644 --- a/hw/dmx/input/lnx-keyboard.c +++ b/hw/dmx/input/lnx-keyboard.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/lnx-keyboard.h b/hw/dmx/input/lnx-keyboard.h index 8f7129048..e36a50499 100644 --- a/hw/dmx/input/lnx-keyboard.h +++ b/hw/dmx/input/lnx-keyboard.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c index 6df4e80d3..b3692a071 100644 --- a/hw/dmx/input/lnx-ms.c +++ b/hw/dmx/input/lnx-ms.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/lnx-ms.h b/hw/dmx/input/lnx-ms.h index bc744431a..9042fc293 100644 --- a/hw/dmx/input/lnx-ms.h +++ b/hw/dmx/input/lnx-ms.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c index 0c5b870aa..8b906df5f 100644 --- a/hw/dmx/input/lnx-ps2.c +++ b/hw/dmx/input/lnx-ps2.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/lnx-ps2.h b/hw/dmx/input/lnx-ps2.h index e3d751e2f..5772e03d0 100644 --- a/hw/dmx/input/lnx-ps2.h +++ b/hw/dmx/input/lnx-ps2.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c index a6fe7ad3b..70695d0f1 100644 --- a/hw/dmx/input/usb-common.c +++ b/hw/dmx/input/usb-common.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-common.h b/hw/dmx/input/usb-common.h index 768312990..5ebfd1e78 100644 --- a/hw/dmx/input/usb-common.h +++ b/hw/dmx/input/usb-common.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c index 4b9439603..efec2705b 100644 --- a/hw/dmx/input/usb-keyboard.c +++ b/hw/dmx/input/usb-keyboard.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/usb-keyboard.h b/hw/dmx/input/usb-keyboard.h index 5a4768a9d..1f9614eef 100644 --- a/hw/dmx/input/usb-keyboard.h +++ b/hw/dmx/input/usb-keyboard.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-mouse.c b/hw/dmx/input/usb-mouse.c index eb1a3d123..efa9d00ec 100644 --- a/hw/dmx/input/usb-mouse.c +++ b/hw/dmx/input/usb-mouse.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-mouse.h b/hw/dmx/input/usb-mouse.h index 2439013ee..918bf6481 100644 --- a/hw/dmx/input/usb-mouse.h +++ b/hw/dmx/input/usb-mouse.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-other.c b/hw/dmx/input/usb-other.c index 9bb284281..d1074b8e1 100644 --- a/hw/dmx/input/usb-other.c +++ b/hw/dmx/input/usb-other.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-other.h b/hw/dmx/input/usb-other.h index b2279fd8d..b69e65933 100644 --- a/hw/dmx/input/usb-other.h +++ b/hw/dmx/input/usb-other.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h index eae9c8b7a..c70668ce5 100644 --- a/hw/dmx/input/usb-private.h +++ b/hw/dmx/input/usb-private.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * |