diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:45:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 08:45:20 +0100 |
| commit | aa403f257e992eac33cd9afd1d87ce9299f6db7a (patch) | |
| tree | 58d78528f35661b96ccfe8979c97044dca75855c /include/linux/atmdev.h | |
| parent | 14b02f023c094767ffc21156fbb40be52ed2b4f2 (diff) | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
| download | cachepc-linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.tar.gz cachepc-linux-aa403f257e992eac33cd9afd1d87ce9299f6db7a.zip | |
Merge 5.12-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/atmdev.h')
| -rw-r--r-- | include/linux/atmdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 60cd25c0461b..9b02961d65ee 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -151,7 +151,7 @@ struct atm_dev { const char *type; /* device type name */ int number; /* device index */ void *dev_data; /* per-device data */ - void *phy_data; /* private PHY date */ + void *phy_data; /* private PHY data */ unsigned long flags; /* device flags (ATM_DF_*) */ struct list_head local; /* local ATM addresses */ struct list_head lecs; /* LECS ATM addresses learned via ILMI */ |