Make radeon stuff build again.

Yet more evidence that I am incompetent with git.

diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h
index f9e459de91a001cb98489a18f398d15c27e58bff..5ea8cff1bfe2070f186f47d0e52158f20f8a999e 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
+++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
@@ -147,12 +147,8 @@
 #define PCI_CHIP_RV410_5E4D            0x5E4D
 #define PCI_CHIP_RV410_5E4F            0x5E4F
 
-<<<<<<< HEAD:src/mesa/drivers/dri/radeon/radeon_chipset.h
 #define PCI_CHIP_RV530_71C4            0x71C4
 #define PCI_CHIP_RV530_71D5            0x71D5
-=======
-#define PCI_CHIP_RV530_71C4             0x71C4
->>>>>>> eff6f1203222a776c5990b5d104b57a7f69b9aab:src/mesa/drivers/dri/radeon/radeon_chipset.h
 
 #define PCI_CHIP_RS350_7834            0x7834
 #define PCI_CHIP_RS350_7835            0x7835

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 7d6b4a75777c566c26759033dfad81f859920fc7..661ffd3a3d461d9d5dd58f3aaf4041ce6a8632b1 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -691,14 +691,11 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
       fprintf(stderr, "Warning, R520 detected, 3D HAHAHAHAHA!!.\n");
       break;
 
-<<<<<<< HEAD:src/mesa/drivers/dri/radeon/radeon_screen.c
    case PCI_CHIP_RV530_71D5:
       screen->chip_family = CHIP_FAMILY_R520;
       fprintf(stderr, "Warning, RV530 detected, all your base belong to us\n");
       break;
 
-=======
->>>>>>> eff6f1203222a776c5990b5d104b57a7f69b9aab:src/mesa/drivers/dri/radeon/radeon_screen.c
    default:
       fprintf(stderr, "unknown chip id 0x%x, can't guess.\n",
              dri_priv->deviceID);