diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-03-19 12:10:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-19 12:10:49 +0100 |
| commit | 01438749e36bfe53ea25c91568019be775a9782e (patch) | |
| tree | f91f5abae2004863afda683589d034dcd2000ab8 /include/linux/atmdev.h | |
| parent | locking/rwsem: Fix comment typo (diff) | |
| parent | locking/ww_mutex: Fix acquire/release imbalance in ww_acquire_init()/ww_acquire_fini() (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up dependent commits
We are applying further, lower-prio fixes on top of two ww_mutex fixes in locking/urgent.
Signed-off-by: Ingo Molnar <mingo@kernel.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 */ |