diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/linux/ramoops.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/linux/ramoops.h')
| -rw-r--r-- | include/linux/ramoops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ramoops.h b/include/linux/ramoops.h index 0ae68a2c1212..484fef81cd3a 100644 --- a/include/linux/ramoops.h +++ b/include/linux/ramoops.h | |||
| @@ -10,6 +10,8 @@ | |||
| 10 | struct ramoops_platform_data { | 10 | struct ramoops_platform_data { |
| 11 | unsigned long mem_size; | 11 | unsigned long mem_size; |
| 12 | unsigned long mem_address; | 12 | unsigned long mem_address; |
| 13 | unsigned long record_size; | ||
| 14 | int dump_oops; | ||
| 13 | }; | 15 | }; |
| 14 | 16 | ||
| 15 | #endif | 17 | #endif |