diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-11-26 13:26:29 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-11-26 13:45:19 -0800 |
| commit | 93d5404e8988882bd33f6acc0d343c4db51eb8b4 (patch) | |
| tree | dd08a576dab4d61fda56dd005c7b2d0001a04297 /drivers/gpu/drm/amd/include/amd_shared.h | |
| parent | af22d0550705dcb4142362b232f972bfab486b89 (diff) | |
| parent | c5c17547b778975b3d83a73c8d84e8fb5ecf3ba5 (diff) | |
| download | linux-93d5404e8988882bd33f6acc0d343c4db51eb8b4.tar.gz linux-93d5404e8988882bd33f6acc0d343c4db51eb8b4.tar.bz2 linux-93d5404e8988882bd33f6acc0d343c4db51eb8b4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ipa/ipa_main.c
8afc7e471ad3 ("net: ipa: separate disabling setup from modem stop")
76b5fbcd6b47 ("net: ipa: kill ipa_modem_init()")
Duplicated include, drop one.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/include/amd_shared.h')
| -rw-r--r-- | drivers/gpu/drm/amd/include/amd_shared.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h index f1a46d16f7ea..4b9e68a79f06 100644 --- a/drivers/gpu/drm/amd/include/amd_shared.h +++ b/drivers/gpu/drm/amd/include/amd_shared.h @@ -98,7 +98,8 @@ enum amd_ip_block_type { AMD_IP_BLOCK_TYPE_ACP, AMD_IP_BLOCK_TYPE_VCN, AMD_IP_BLOCK_TYPE_MES, - AMD_IP_BLOCK_TYPE_JPEG + AMD_IP_BLOCK_TYPE_JPEG, + AMD_IP_BLOCK_TYPE_NUM, }; enum amd_clockgating_state { |