git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-2.6.35
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_family.h
diff --git
a/drivers/gpu/drm/radeon/radeon_family.h
b/drivers/gpu/drm/radeon/radeon_family.h
index
93c7d5d
..
e329066
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_family.h
+++ b/
drivers/gpu/drm/radeon/radeon_family.h
@@
-36,7
+36,7
@@
* Radeon chip families
*/
enum radeon_family {
- CHIP_R100,
+ CHIP_R100
= 0
,
CHIP_RV100,
CHIP_RS100,
CHIP_RV200,
@@
-99,4
+99,5
@@
enum radeon_chip_flags {
RADEON_IS_PCI = 0x00800000UL,
RADEON_IS_IGPGART = 0x01000000UL,
};
+
#endif