diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/linux/istallion.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/linux/istallion.h')
| -rw-r--r-- | include/linux/istallion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/istallion.h b/include/linux/istallion.h index 7faca98c7d14..ad700a60c158 100644 --- a/include/linux/istallion.h +++ b/include/linux/istallion.h | |||
| @@ -86,7 +86,7 @@ struct stlibrd { | |||
| 86 | unsigned long magic; | 86 | unsigned long magic; |
| 87 | unsigned int brdnr; | 87 | unsigned int brdnr; |
| 88 | unsigned int brdtype; | 88 | unsigned int brdtype; |
| 89 | unsigned int state; | 89 | unsigned long state; |
| 90 | unsigned int nrpanels; | 90 | unsigned int nrpanels; |
| 91 | unsigned int nrports; | 91 | unsigned int nrports; |
| 92 | unsigned int nrdevs; | 92 | unsigned int nrdevs; |