Merge branch 'linus' into x86/entry, to resolve conflicts

[sfrench/cifs-2.6.git] / include / linux / tifm.h

diff --git a/include/linux/tifm.h b/include/linux/tifm.h
index 299cbb8c63bb299d6f9943aef45c194fbb0e857c..44073d06710f67f6bf9bf00344c116b34d4d6ac0 100644 (file)
--- a/include/linux/tifm.h
+++ b/include/linux/tifm.h
@@ -124,7 +124,7 @@ struct tifm_adapter {
        int                 (*has_ms_pif)(struct tifm_adapter *fm,
                                          struct tifm_dev *sock);
 
-       struct tifm_dev     *sockets[0];
+       struct tifm_dev     *sockets[];
 };
 
 struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,