diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/cper.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux/cper.h')
| -rw-r--r-- | include/linux/cper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h index 3104aaff5dd0..372a25839fd1 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h | |||
| @@ -388,5 +388,7 @@ struct cper_sec_pcie { | |||
| 388 | #pragma pack() | 388 | #pragma pack() |
| 389 | 389 | ||
| 390 | u64 cper_next_record_id(void); | 390 | u64 cper_next_record_id(void); |
| 391 | void cper_print_bits(const char *prefix, unsigned int bits, | ||
| 392 | const char *strs[], unsigned int strs_size); | ||
| 391 | 393 | ||
| 392 | #endif | 394 | #endif |