1 files changed, 29 insertions, 0 deletions

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 468819cdde87..b29e7f6f8fa5 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -436,6 +436,17 @@ struct spi_device_id {
                         __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 
+/* mcp */
+
+#define MCP_NAME_SIZE   20
+#define MCP_MODULE_PREFIX "mcp:"
+
+struct mcp_device_id {
+        char name[MCP_NAME_SIZE];
+        kernel_ulong_t driver_data      /* Data private to the driver */
+                        __attribute__((aligned(sizeof(kernel_ulong_t))));
+};
+
 /* dmi */
 enum dmi_field {
         DMI_NONE,
@@ -542,4 +553,22 @@ struct isapnp_device_id {
         kernel_ulong_t driver_data;     /* data private to the driver */
 };
 
+/**
+ * struct amba_id - identifies a device on an AMBA bus
+ * @id: The significant bits if the hardware device ID
+ * @mask: Bitmask specifying which bits of the id field are significant when
+ *      matching.  A driver binds to a device when ((hardware device ID) & mask)
+ *      == id.
+ * @data: Private data used by the driver.
+ */
+struct amba_id {
+        unsigned int            id;
+        unsigned int            mask;
+#ifndef __KERNEL__
+        kernel_ulong_t          data;
+#else
+        void                    *data;
+#endif
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */