diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 16:39:02 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 16:39:02 (GMT) |
| commit | f341dddf1dadf64be309791f83d7904245f1261d (patch) | |
| tree | 974c9e1f23da6743532162fd86cf019da497eaff /drivers/staging/batman-adv/packet.h | |
| parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
| parent | b02957d58a27525499ab10d272d3b44682a7ae50 (diff) | |
| download | linux-fsl-qoriq-f341dddf1dadf64be309791f83d7904245f1261d.tar.xz | |
Staging: merge staging patches into Linus's main branch
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch. This merge resolves those merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 5627ca3..ad006ce 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)); |