diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/gpu/drm/radeon/radeon_family.h | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_family.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_family.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h index 93c7d5d41914..e329066dcabd 100644 --- a/drivers/gpu/drm/radeon/radeon_family.h +++ b/drivers/gpu/drm/radeon/radeon_family.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | * Radeon chip families | 36 | * Radeon chip families |
| 37 | */ | 37 | */ |
| 38 | enum radeon_family { | 38 | enum radeon_family { |
| 39 | CHIP_R100, | 39 | CHIP_R100 = 0, |
| 40 | CHIP_RV100, | 40 | CHIP_RV100, |
| 41 | CHIP_RS100, | 41 | CHIP_RS100, |
| 42 | CHIP_RV200, | 42 | CHIP_RV200, |
| @@ -99,4 +99,5 @@ enum radeon_chip_flags { | |||
| 99 | RADEON_IS_PCI = 0x00800000UL, | 99 | RADEON_IS_PCI = 0x00800000UL, |
| 100 | RADEON_IS_IGPGART = 0x01000000UL, | 100 | RADEON_IS_IGPGART = 0x01000000UL, |
| 101 | }; | 101 | }; |
| 102 | |||
| 102 | #endif | 103 | #endif |