diff options
| author | Corbin Simpson <[email protected]> | 2008-05-02 15:33:02 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2008-05-02 15:33:02 -0700 |
| commit | 92a0e93ac33ceb64a4e7e930223950d4529cef37 (patch) | |
| tree | 95a3d2c81ec141d12ece6cf94d3cd3e6f20b3fd6 /src/mesa | |
| parent | 9a82fde43aaaeab4370126d549aee8061b3a6937 (diff) | |
Make radeon stuff build again.
Yet more evidence that I am incompetent with git.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_chipset.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h index f9e459de91a..5ea8cff1bfe 100644 --- 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 7d6b4a75777..661ffd3a3d4 100644 --- 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); |