Merge bk://linux-dj.bkbits.net/agpgart

into home.osdl.org:/home/torvalds/v2.5/linux

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

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];