summaryrefslogtreecommitdiffstats
path: root/include/linux/mod_devicetable.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-02-22 18:36:17 -0700
committerGrant Likely <grant.likely@secretlab.ca>2012-02-22 18:36:17 -0700
commitdaefd89efc279b142bbb054577c2d706da211723 (patch)
tree2298056232548f6f22d7bbff2662a2bbf64520de /include/linux/mod_devicetable.h
parent6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff)
parentf86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff)
downloadcachepc-linux-daefd89efc279b142bbb054577c2d706da211723.tar.gz
cachepc-linux-daefd89efc279b142bbb054577c2d706da211723.zip
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'include/linux/mod_devicetable.h')
-rw-r--r--include/linux/mod_devicetable.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index b29e7f6f8fa5..83ac0713ed0a 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -436,17 +436,6 @@ 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,