svn commit: r190018 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/drm

[Robert Noland]

Author: rnoland
Date: Thu Mar 19 07:41:58 2009
New Revision: 190018
URL: http://svn.freebsd.org/changeset/base/190018

Log:
  Merge 189899
  
  Use the right MSI_REARM for RS600.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/drm/radeon_irq.c

Modified: stable/7/sys/dev/drm/radeon_irq.c
==============================================================================
--- stable/7/sys/dev/drm/radeon_irq.c	Thu Mar 19 07:40:41 2009	(r190017)
+++ stable/7/sys/dev/drm/radeon_irq.c	Thu Mar 19 07:41:58 2009	(r190018)
@@ -229,6 +229,7 @@ irqreturn_t radeon_driver_irq_handler(DR
 				RADEON_WRITE(RADEON_AIC_CNTL,
 				    tmp | RS400_MSI_REARM);
 				break;
+			case CHIP_RS600:
 			case CHIP_RS690:
 			case CHIP_RS740:
 				tmp = RADEON_READ(RADEON_BUS_CNTL) &