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

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

diff --git a/include/linux/cb710.h b/include/linux/cb710.h
index 60de3fedd3a77d77a827e689734008d15aa0c910..405657a9a0d5403db9da5aea3679e373318657a8 100644 (file)
--- a/include/linux/cb710.h
+++ b/include/linux/cb710.h
@@ -36,7 +36,7 @@ struct cb710_chip {
        unsigned                slot_mask;
        unsigned                slots;
        spinlock_t              irq_lock;
-       struct cb710_slot       slot[0];
+       struct cb710_slot       slot[];
 };
 
 /* NOTE: cb710_chip.slots is modified only during device init/exit and