Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / include / linux / istallion.h

diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 7faca98c7d1448885a0ecf31f2453fc908ec35e7..ad700a60c1587c19b7abfd90c3c120fa75950d2c 100644 (file)
--- 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;