diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-18 10:45:32 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-19 18:14:02 +0100 |
| commit | 4f5a884fc212d99654e4fb36ba98d5354f0dd18e (patch) | |
| tree | f4ac26f5acd43be75cb9d3b2f89fa92c40dbc8ee /drivers/phy/marvell/phy-mvebu-cp110-utmi.c | |
| parent | KVM: avoid warning on s390 in mark_page_dirty (diff) | |
| parent | KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock (diff) | |
| download | linux-4f5a884fc212d99654e4fb36ba98d5354f0dd18e.tar.xz linux-4f5a884fc212d99654e4fb36ba98d5354f0dd18e.zip | |
Merge branch 'kvm-pi-raw-spinlock' into HEAD
Bring in fix for VT-d posted interrupts before further changing the code in 5.17.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'drivers/phy/marvell/phy-mvebu-cp110-utmi.c')
| -rw-r--r-- | drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/marvell/phy-mvebu-cp110-utmi.c b/drivers/phy/marvell/phy-mvebu-cp110-utmi.c index 08d178a4dc13..aa27c7994610 100644 --- a/drivers/phy/marvell/phy-mvebu-cp110-utmi.c +++ b/drivers/phy/marvell/phy-mvebu-cp110-utmi.c @@ -82,9 +82,9 @@ * struct mvebu_cp110_utmi - PHY driver data * * @regs: PHY registers - * @syscom: Regmap with system controller registers + * @syscon: Regmap with system controller registers * @dev: device driver handle - * @caps: PHY capabilities + * @ops: phy ops */ struct mvebu_cp110_utmi { void __iomem *regs; |