aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorWolfram Sang <wsa@kernel.org>2022-09-27 21:33:37 +0200
committerWolfram Sang <wsa@kernel.org>2022-09-27 21:33:37 +0200
commit85f17d677f6c40069287617630f202eb20fcfe36 (patch)
treea0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/video
parentmacintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff)
parentLinux 6.0-rc7 (diff)
downloadlinux-dev-85f17d677f6c40069287617630f202eb20fcfe36.tar.xz
linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.zip
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/hyperv_fb.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 886c564787f1..b58b445bb529 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -74,10 +74,6 @@
#define SYNTHVID_DEPTH_WIN8 32
#define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024)
-#define PCI_VENDOR_ID_MICROSOFT 0x1414
-#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353
-
-
enum pipe_msg_type {
PIPE_MSG_INVALID,
PIPE_MSG_DATA,