diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
tree | baec074db38a5ceaaabbcee76f199acef43bb42a /include | |
parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-v850/ptrace.h | 2 | ||||
-rw-r--r-- | include/linux/pfkeyv2.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-v850/ptrace.h b/include/asm-v850/ptrace.h index 7bf72bb5078c..4f35cf2cd641 100644 --- a/include/asm-v850/ptrace.h +++ b/include/asm-v850/ptrace.h | |||
@@ -92,7 +92,7 @@ struct pt_regs | |||
92 | /* The number of bytes used to store each register. */ | 92 | /* The number of bytes used to store each register. */ |
93 | #define _PT_REG_SIZE 4 | 93 | #define _PT_REG_SIZE 4 |
94 | 94 | ||
95 | /* Offset of a general purpose register in a stuct pt_regs. */ | 95 | /* Offset of a general purpose register in a struct pt_regs. */ |
96 | #define PT_GPR(num) ((num) * _PT_REG_SIZE) | 96 | #define PT_GPR(num) ((num) * _PT_REG_SIZE) |
97 | 97 | ||
98 | /* Offsets of various special registers & fields in a struct pt_regs. */ | 98 | /* Offsets of various special registers & fields in a struct pt_regs. */ |
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index 6351c4055ace..bac0fb389cf1 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h | |||
@@ -104,7 +104,7 @@ struct sadb_prop { | |||
104 | /* followed by: | 104 | /* followed by: |
105 | struct sadb_comb sadb_combs[(sadb_prop_len + | 105 | struct sadb_comb sadb_combs[(sadb_prop_len + |
106 | sizeof(uint64_t) - sizeof(struct sadb_prop)) / | 106 | sizeof(uint64_t) - sizeof(struct sadb_prop)) / |
107 | sizeof(strut sadb_comb)]; */ | 107 | sizeof(struct sadb_comb)]; */ |
108 | 108 | ||
109 | struct sadb_comb { | 109 | struct sadb_comb { |
110 | uint8_t sadb_comb_auth; | 110 | uint8_t sadb_comb_auth; |