Merge tag 'nfsd-4.7-1' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / include / linux / mcb.h

diff --git a/include/linux/mcb.h b/include/linux/mcb.h
index ed06e15a36aa299c6110dc27870aadbc5987d650..ead13d233a97e60392110d0b8bba43c3b7fa5e5a 100644 (file)
--- a/include/linux/mcb.h
+++ b/include/linux/mcb.h
@@ -15,22 +15,30 @@
 #include <linux/device.h>
 #include <linux/irqreturn.h>
 
+#define CHAMELEON_FILENAME_LEN 12
+
 struct mcb_driver;
 struct mcb_device;
 
 /**
  * struct mcb_bus - MEN Chameleon Bus
  *
- * @dev: pointer to carrier device
- * @children: the child busses
+ * @dev: bus device
+ * @carrier: pointer to carrier device
  * @bus_nr: mcb bus number
  * @get_irq: callback to get IRQ number
+ * @revision: the FPGA's revision number
+ * @model: the FPGA's model number
+ * @filename: the FPGA's name
  */
 struct mcb_bus {
-       struct list_head children;
        struct device dev;
        struct device *carrier;
        int bus_nr;
+       u8 revision;
+       char model;
+       u8 minor;
+       char name[CHAMELEON_FILENAME_LEN + 1];
        int (*get_irq)(struct mcb_device *dev);
 };
 #define to_mcb_bus(b) container_of((b), struct mcb_bus, dev)