Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/r600: set correct pitch for 4 byte copy
  drm/radeon: consolidate family flags used in pciids.

1 files changed, 1 insertions, 58 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index c839b608970f..6311b1362594 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -49,6 +49,7 @@
 #include <linux/list.h>
 #include <linux/kref.h>
 
+#include "radeon_family.h"
 #include "radeon_mode.h"
 #include "radeon_reg.h"
 
@@ -77,64 +78,6 @@ extern int radeon_tv;
 #define RADEONFB_CONN_LIMIT             4
 #define RADEON_BIOS_NUM_SCRATCH         8
 
-enum radeon_family {
-        CHIP_R100,
-        CHIP_RV100,
-        CHIP_RS100,
-        CHIP_RV200,
-        CHIP_RS200,
-        CHIP_R200,
-        CHIP_RV250,
-        CHIP_RS300,
-        CHIP_RV280,
-        CHIP_R300,
-        CHIP_R350,
-        CHIP_RV350,
-        CHIP_RV380,
-        CHIP_R420,
-        CHIP_R423,
-        CHIP_RV410,
-        CHIP_RS400,
-        CHIP_RS480,
-        CHIP_RS600,
-        CHIP_RS690,
-        CHIP_RS740,
-        CHIP_RV515,
-        CHIP_R520,
-        CHIP_RV530,
-        CHIP_RV560,
-        CHIP_RV570,
-        CHIP_R580,
-        CHIP_R600,
-        CHIP_RV610,
-        CHIP_RV630,
-        CHIP_RV670,
-        CHIP_RV620,
-        CHIP_RV635,
-        CHIP_RS780,
-        CHIP_RS880,
-        CHIP_RV770,
-        CHIP_RV730,
-        CHIP_RV710,
-        CHIP_RV740,
-        CHIP_LAST,
-};
-
-enum radeon_chip_flags {
-        RADEON_FAMILY_MASK = 0x0000ffffUL,
-        RADEON_FLAGS_MASK = 0xffff0000UL,
-        RADEON_IS_MOBILITY = 0x00010000UL,
-        RADEON_IS_IGP = 0x00020000UL,
-        RADEON_SINGLE_CRTC = 0x00040000UL,
-        RADEON_IS_AGP = 0x00080000UL,
-        RADEON_HAS_HIERZ = 0x00100000UL,
-        RADEON_IS_PCIE = 0x00200000UL,
-        RADEON_NEW_MEMMAP = 0x00400000UL,
-        RADEON_IS_PCI = 0x00800000UL,
-        RADEON_IS_IGPGART = 0x01000000UL,
-};
-
-
 /*
  * Errata workarounds.
  */