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

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

drivers/char/agp/ati-agp.c

@@ -151,7 +151,7 @@ static int ati_fetch_size(void)
 	u32 temp;
 	struct aper_size_info_lvl2 *values;
 
-	if (is_r200)
+	if (is_r200())
 		pci_read_config_dword(agp_bridge->dev, ATI_RS100_APSIZE, &temp);
 	else
 		pci_read_config_dword(agp_bridge->dev, ATI_RS300_APSIZE, &temp);
@@ -184,7 +184,7 @@ static void ati_cleanup(void)
 	previous_size = A_SIZE_LVL2(agp_bridge->previous_size);
 
 	/* Write back the previous size and disable gart translation */
-	if (is_r200) {
+	if (is_r200()) {
 		pci_read_config_dword(agp_bridge->dev, ATI_RS100_APSIZE, &temp);
 		temp = ((temp & ~(0x0000000f)) | previous_size->size_value);
 		pci_write_config_dword(agp_bridge->dev, ATI_RS100_APSIZE, temp);
@@ -206,7 +206,7 @@ static int ati_configure(void)
 	temp = (temp & 0xfffff000);
 	ati_generic_private.registers = (volatile u8 *) ioremap(temp, 4096);
 
-	if (is_r200)
+	if (is_r200())
        	pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
 	else
 		pci_write_config_dword(agp_bridge->dev, ATI_RS300_IG_AGPMODE, 0x20000);
@@ -333,7 +333,7 @@ static int ati_create_gatt_table(void)
 	/* Write out the size register */
 	current_size = A_SIZE_LVL2(agp_bridge->current_size);
 
-	if (is_r200) {
+	if (is_r200()) {
 		pci_read_config_dword(agp_bridge->dev, ATI_RS100_APSIZE, &temp);
 		temp = (((temp & ~(0x0000000e)) | current_size->size_value)
 			| 0x00000001);