]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/nv50: add dcb type 14 to enum to prevent compiler complaint
authorBen Skeggs <bskeggs@redhat.com>
Tue, 17 Aug 2010 04:34:00 +0000 (14:34 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 26 Aug 2010 05:11:02 +0000 (15:11 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_bios.h

index e4f33a4edea13e850c5a74932c87fbfdba842fe4..e10d851a724043b33186f4250cc4301c9e1e40f8 100644 (file)
@@ -6153,7 +6153,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb,
                        entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4;
 
                break;
-       case 0xe:
+       case OUTPUT_EOL:
                /* weird g80 mobile type that "nv" treats as a terminator */
                dcb->entries--;
                return false;
index fd14dfd3d780f6b45a280d1cf4c4aed6eb41ed20..c1de2f3fcb0ea7e78ec193d88c74683d5090eaba 100644 (file)
@@ -95,6 +95,7 @@ enum dcb_type {
        OUTPUT_TMDS = 2,
        OUTPUT_LVDS = 3,
        OUTPUT_DP = 6,
+       OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */
        OUTPUT_ANY = -1
 };