diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 15:50:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-21 15:50:13 +1100 |
| commit | 0747f7716e6bf96483922904ee14936353865c52 (patch) | |
| tree | fde20e508d2671990f77686e0e7e968f8fdb9921 /drivers/staging/batman-adv/packet.h | |
| parent | e5befd178b2168a6e538fd118cc11be34fadabdc (diff) | |
| parent | bf2ac280f2478de0aed46e851060d3c0fce3674b (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/batman-adv/packet.h')
| -rw-r--r-- | drivers/staging/batman-adv/packet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/packet.h b/drivers/staging/batman-adv/packet.h index 5627ca326018..ad006ce8b131 100644 --- a/drivers/staging/batman-adv/packet.h +++ b/drivers/staging/batman-adv/packet.h @@ -90,7 +90,7 @@ struct vis_packet { uint8_t entries; /* number of entries behind this struct */ uint8_t ttl; /* TTL */ uint8_t vis_orig[6]; /* originator that informs about its - * neighbours */ + * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ } __attribute__((packed)); |