git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
[sfrench/cifs-2.6.git]
/
include
/
linux
/
mod_devicetable.h
diff --git
a/include/linux/mod_devicetable.h
b/include/linux/mod_devicetable.h
index 83ac0713ed0aa9a2a0c79b95013c5bfd42137d9c..b29e7f6f8fa580d9c4c39b4fca596a98e249b2d4 100644
(file)
--- 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))));
};
__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,
/* dmi */
enum dmi_field {
DMI_NONE,