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

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

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 468819cdde87c987fad9294e53dcc5652c508980..83ac0713ed0aa9a2a0c79b95013c5bfd42137d9c 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -542,4 +542,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 */