diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | |
| parent | ecc4946f11a07884f230450a6d5a92337bc21375 (diff) | |
| parent | dc4060a5dc2557e6b5aa813bf5b73677299d62d2 (diff) | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h index f670e63a5a01..110c6e8222c7 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h @@ -80,7 +80,7 @@ struct hns_ppe_cb { struct hns_ppe_hw_stats hw_stats; u8 index; /* index in a ppe common device */ - void __iomem *io_base; + u8 __iomem *io_base; int virq; u32 rss_indir_table[HNS_PPEV2_RSS_IND_TBL_SIZE]; /*shadow indir tab */ u32 rss_key[HNS_PPEV2_RSS_KEY_NUM]; /* rss hash key */ @@ -89,7 +89,7 @@ struct hns_ppe_cb { struct ppe_common_cb { struct device *dev; struct dsaf_device *dsaf_dev; - void __iomem *io_base; + u8 __iomem *io_base; enum ppe_common_mode ppe_mode; |