summaryrefslogtreecommitdiff
path: root/drivers/char/drm/drm_pciids.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 05:39:31 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 05:39:31 +0300
commitc2cc87ca9561ddfe744d446789cc10f507e87db9 (patch)
treed505fc0110eb1a3d8750ba2f67648c131f0d9aca /drivers/char/drm/drm_pciids.h
parentce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff)
parent7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff)
downloadlinux-c2cc87ca9561ddfe744d446789cc10f507e87db9.tar.xz
Merge branch 'master'
Diffstat (limited to 'drivers/char/drm/drm_pciids.h')
-rw-r--r--drivers/char/drm/drm_pciids.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 58b1747cd440..d66dc55e29a0 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -234,4 +234,3 @@
{0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0, 0, 0}
-