diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 22:38:55 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 22:38:55 +0300 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/char/drm/via_3d_reg.h | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
| download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/drm/via_3d_reg.h')
| -rw-r--r-- | drivers/char/drm/via_3d_reg.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/drm/via_3d_reg.h b/drivers/char/drm/via_3d_reg.h index cf61bb514db1..462375d543b9 100644 --- a/drivers/char/drm/via_3d_reg.h +++ b/drivers/char/drm/via_3d_reg.h @@ -1643,7 +1643,6 @@ #define HC_HAGPBpID_STOP 0x00000002 #define HC_HAGPBpH_MASK 0x00ffffff - #define VIA_VIDEO_HEADER5 0xFE040000 #define VIA_VIDEO_HEADER6 0xFE050000 #define VIA_VIDEO_HEADER7 0xFE060000 |