diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/video/aty/radeon_accel.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/video/aty/radeon_accel.c')
| -rw-r--r-- | drivers/video/aty/radeon_accel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c index 3ca27cb13caa..4d13f68436e6 100644 --- a/drivers/video/aty/radeon_accel.c +++ b/drivers/video/aty/radeon_accel.c | |||
| @@ -241,8 +241,8 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo) | |||
| 241 | INREG(HOST_PATH_CNTL); | 241 | INREG(HOST_PATH_CNTL); |
| 242 | OUTREG(HOST_PATH_CNTL, host_path_cntl); | 242 | OUTREG(HOST_PATH_CNTL, host_path_cntl); |
| 243 | 243 | ||
| 244 | if (rinfo->family != CHIP_FAMILY_R300 || | 244 | if (rinfo->family != CHIP_FAMILY_R300 && |
| 245 | rinfo->family != CHIP_FAMILY_R350 || | 245 | rinfo->family != CHIP_FAMILY_R350 && |
| 246 | rinfo->family != CHIP_FAMILY_RV350) | 246 | rinfo->family != CHIP_FAMILY_RV350) |
| 247 | OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset); | 247 | OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset); |
| 248 | 248 | ||