diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2022-05-01 23:25:10 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2022-05-01 23:25:10 +0200 |
| commit | f930b69a8944ab3f018e2a175ddbd16e71348df9 (patch) | |
| tree | bfde4972394d741196bcd1cf173bfda4639123a7 /drivers/gpu/drm/amd/amdgpu/ObjectID.h | |
| parent | pinctrl/rockchip: add rk3588 support (diff) | |
| parent | Linux 5.18-rc5 (diff) | |
| download | linux-rng-f930b69a8944ab3f018e2a175ddbd16e71348df9.tar.xz linux-rng-f930b69a8944ab3f018e2a175ddbd16e71348df9.zip | |
Merge tag 'v5.18-rc5' into devel
Merge in Linux 5.18-rc5 since new code to the STM32 driver
depend in a non-trivial way on the fixes merged in -rc5.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/ObjectID.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/ObjectID.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/ObjectID.h b/drivers/gpu/drm/amd/amdgpu/ObjectID.h index 5b393622f592..a0f0a17e224f 100644 --- a/drivers/gpu/drm/amd/amdgpu/ObjectID.h +++ b/drivers/gpu/drm/amd/amdgpu/ObjectID.h @@ -119,6 +119,7 @@ #define CONNECTOR_OBJECT_ID_eDP 0x14 #define CONNECTOR_OBJECT_ID_MXM 0x15 #define CONNECTOR_OBJECT_ID_LVDS_eDP 0x16 +#define CONNECTOR_OBJECT_ID_USBC 0x17 /* deleted */ |