diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:24 +0000 |
| commit | 790d0008d775eebcdf4fe92b6da7b3c8b6d99631 (patch) | |
| tree | 5277173012ff185dbc8af100cb081ea9cb8d7775 | |
| parent | b939822d85ac08ab517b32c2f3d6b9f1f3183c14 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
| -rw-r--r-- | man/imstt.man | 2 | ||||
| -rw-r--r-- | src/imstt.h | 2 | ||||
| -rw-r--r-- | src/imstt_accel.c | 2 | ||||
| -rw-r--r-- | src/imstt_driver.c | 2 | ||||
| -rw-r--r-- | src/imstt_reg.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/man/imstt.man b/man/imstt.man index 377d117..bc34a38 100644 --- a/man/imstt.man +++ b/man/imstt.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1 2001/01/24 00:06:20 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH IMSTT __drivermansuffix__ __vendorversion__ diff --git a/src/imstt.h b/src/imstt.h index b714aaf..624d416 100644 --- a/src/imstt.h +++ b/src/imstt.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5 2001/05/16 06:48:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4 2001/04/05 21:29:14 dawes Exp $ */ #ifndef _IMSTT_H #define _IMSTT_H diff --git a/src/imstt_accel.c b/src/imstt_accel.c index 86dca58..d52e03d 100644 --- a/src/imstt_accel.c +++ b/src/imstt_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6 2001/05/16 06:48:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5 2001/04/05 21:29:14 dawes Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> diff --git a/src/imstt_driver.c b/src/imstt_driver.c index be57c46..8ce2876 100644 --- a/src/imstt_driver.c +++ b/src/imstt_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.21 2003/08/23 15:03:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v 1.20 2002/09/24 15:23:55 tsi Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> diff --git a/src/imstt_reg.h b/src/imstt_reg.h index 343fb6c..9870f49 100644 --- a/src/imstt_reg.h +++ b/src/imstt_reg.h @@ -9,7 +9,7 @@ static __inline__ void regw(unsigned long base_addr, unsigned long regindex, unsigned long regdata) { - asm volatile ("stwbrx %1,%2,%3; eieio" + __asm__ __volatile__ ("stwbrx %1,%2,%3; eieio" : "=m" (*(volatile unsigned *)(base_addr+regindex)) : "r" (regdata), "b" (regindex), "r" (base_addr)); } @@ -19,7 +19,7 @@ static __inline__ unsigned long regr(unsigned long base_addr, unsigned long regi { register unsigned long val; - asm volatile ("lwbrx %0,%1,%2; eieio" + __asm__ __volatile__ ("lwbrx %0,%1,%2; eieio" : "=r" (val) : "b" (regindex), "r" (base_addr), "m" (*(volatile unsigned *)(base_addr+regindex))); |