diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 02:49:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 02:49:04 -0400 |
| commit | e199e6136ce6b151e6638ae93dca60748424d900 (patch) | |
| tree | 0d66e0b5d227c36b005e4f5537f4bbcfc6ed4904 /include/linux/istallion.h | |
| parent | 972c40b5bee429c84ba727f8ac0a08292bc5dc3d (diff) | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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; |