diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-04 22:50:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-04 22:50:48 -0700 |
| commit | 7c2dd86b82e5d4e44a41c871b9d8cdad5317645f (patch) | |
| tree | c946cf4d4b5d10b33a6d08212f9da15c496722c8 | |
| parent | cd48bc4afd2e7db2ec04b3174076b5bc091b116e (diff) | |
| parent | 5ca838e10f7ba096cbea8f0bd2f29a11e4116570 (diff) | |
Merge bk://linux-dj.bkbits.net/agpgart
into home.osdl.org:/home/torvalds/v2.5/linux
| -rw-r--r-- | drivers/char/agp/agp.h | 2 | ||||
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 2a4b9e0dc363..ee679cbdf6d2 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -302,7 +302,7 @@ struct agp_bridge_data { #define AMD64_GARTAPERTUREBASE 0x94 #define AMD64_GARTTABLEBASE 0x98 #define AMD64_GARTCACHECTL 0x9c -#define AMD64_GARTEN 1<<0 +#define AMD64_GARTEN (1<<0) /* ALi registers */ #define ALI_AGPCTRL 0xb8 diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 8ae550973d4e..f60cb63720d8 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c @@ -26,13 +26,13 @@ #define GPTE_COHERENT 2 /* Aperture control register bits. */ -#define GARTEN 1<<0 -#define DISGARTCPU 1<<4 -#define DISGARTIO 1<<5 +#define GARTEN (1<<0) +#define DISGARTCPU (1<<4) +#define DISGARTIO (1<<5) /* GART cache control register bits. */ -#define INVGART 1<<0 -#define GARTPTEERR 1<<1 +#define INVGART (1<<0) +#define GARTPTEERR (1<<1) static int nr_garts; static struct pci_dev * hammers[MAX_HAMMER_GARTS]; |