nouveau: Remove excess device classes.

diff --git a/shared-core/nouveau_drm.h b/shared-core/nouveau_drm.h
index c4f1e9a..988d467 100644 (file)
--- a/shared-core/nouveau_drm.h
+++ b/shared-core/nouveau_drm.h
@@ -123,12 +123,9 @@ enum nouveau_card_type {
        NV_05      =5,
        NV_10      =10,
        NV_11      =11,
-       NV_15      =11,
        NV_17      =17,
        NV_20      =20,
-       NV_25      =20,
        NV_30      =30,
-       NV_34      =30,
        NV_40      =40,
        NV_44      =44,
        NV_50      =50,

diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index a163ae6..dc075d0 100644 (file)
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -441,18 +441,12 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
                dev_priv->card_type = NV_44;
        } else if (architecture >= 0x40) {
                dev_priv->card_type = NV_40;
-       } else if (architecture >= 0x34) {
-               dev_priv->card_type = NV_34;
        } else if (architecture >= 0x30) {
                dev_priv->card_type = NV_30;
-       } else if (architecture >= 0x25) {
-               dev_priv->card_type = NV_25;
        } else if (architecture >= 0x20) {
                dev_priv->card_type = NV_20;
        } else if (architecture >= 0x17) {
                dev_priv->card_type = NV_17;
-       } else if (architecture >= 0x15) {
-               dev_priv->card_type = NV_15;
        } else if (architecture >= 0x11) {
                dev_priv->card_type = NV_11;
        } else if (architecture >= 0x10) {