diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /include/video/aty128.h | |
| parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
| parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/video/aty128.h')
| -rw-r--r-- | include/video/aty128.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/aty128.h b/include/video/aty128.h index 51ac69f05bd..f0851e3bb7c 100644 --- a/include/video/aty128.h +++ b/include/video/aty128.h | |||
| @@ -415,7 +415,7 @@ | |||
| 415 | #define PWR_MGT_SLOWDOWN_MCLK 0x00002000 | 415 | #define PWR_MGT_SLOWDOWN_MCLK 0x00002000 |
| 416 | 416 | ||
| 417 | #define PMI_PMSCR_REG 0x60 | 417 | #define PMI_PMSCR_REG 0x60 |
| 418 | 418 | ||
| 419 | /* used by ATI bug fix for hardware ROM */ | 419 | /* used by ATI bug fix for hardware ROM */ |
| 420 | #define RAGE128_MPP_TB_CONFIG 0x01c0 | 420 | #define RAGE128_MPP_TB_CONFIG 0x01c0 |
| 421 | 421 | ||