diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 10:41:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 10:41:59 -0700 |
| commit | a0cd30fd26a398c0c6e50c6760610d4529f17a84 (patch) | |
| tree | 00c02a25966468706adf9a1d035c08f71baa6078 /drivers/w1/w1_netlink.h | |
| parent | 94eb7f4cefaf3ed8e97504ce4f3946bdb908e501 (diff) | |
| parent | e5c515b4532f4aac2b1136612d8c3ecd1891f431 (diff) | |
| download | talos-op-linux-a0cd30fd26a398c0c6e50c6760610d4529f17a84.tar.gz talos-op-linux-a0cd30fd26a398c0c6e50c6760610d4529f17a84.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
Diffstat (limited to 'drivers/w1/w1_netlink.h')
| -rw-r--r-- | drivers/w1/w1_netlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h index ea1b530abad0..8615756946df 100644 --- a/drivers/w1/w1_netlink.h +++ b/drivers/w1/w1_netlink.h @@ -33,13 +33,13 @@ enum w1_netlink_message_types { W1_MASTER_REMOVE, }; -struct w1_netlink_msg +struct w1_netlink_msg { __u8 type; __u8 reserved[3]; union { - struct w1_reg_num id; + struct w1_reg_num id; __u64 w1_id; struct { |
