diff options
author | 2010-08-20 13:53:08 +0200 | |
---|---|---|
committer | 2010-08-20 13:53:08 +0200 | |
commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /include/linux/istallion.h | |
parent | fixes for using make 3.82 (diff) | |
parent | Linux 2.6.36-rc1 (diff) | |
download | wireguard-linux-e981b060767b3c4ac9393ad8d2558d648e35dfcb.tar.xz wireguard-linux-e981b060767b3c4ac9393ad8d2558d648e35dfcb.zip |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
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 { unsigned long magic; unsigned int brdnr; unsigned int brdtype; - unsigned int state; + unsigned long state; unsigned int nrpanels; unsigned int nrports; unsigned int nrdevs; |