diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 10:05:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 10:05:10 -0800 |
| commit | fc03da1ca1954f103ed57daf90611cefa57b07e0 (patch) | |
| tree | 2b9b44b1a39f7743c1c3d7bc89654792686d7dbc /drivers/video | |
| parent | caf5b04c82f05c65843b2d7189845d6c3df5a41e (diff) | |
| parent | e05b3b4adbaeea508bd1c195f1f2e22c8251176b (diff) | |
| download | linux-3.10-fc03da1ca1954f103ed57daf90611cefa57b07e0.tar.gz linux-3.10-fc03da1ca1954f103ed57daf90611cefa57b07e0.tar.bz2 linux-3.10-fc03da1ca1954f103ed57daf90611cefa57b07e0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aty/radeon_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 097d668c4fe..556895e9964 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c @@ -2734,7 +2734,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk) * BIOS does tho. Right now, all this PM stuff is pmac-only for that * reason. --BenH */ -#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF) +#if defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) if (_machine == _MACH_Pmac && rinfo->of_node) { if (rinfo->is_mobility && rinfo->pm_reg && rinfo->family <= CHIP_FAMILY_RV250) @@ -2778,12 +2778,12 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk) OUTREG(TV_DAC_CNTL, INREG(TV_DAC_CNTL) | 0x07000000); #endif } -#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */ +#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */ } void radeonfb_pm_exit(struct radeonfb_info *rinfo) { -#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF) +#if defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) if (rinfo->pm_mode != radeon_pm_none) pmac_set_early_video_resume(NULL, NULL); #endif |