diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /include/linux/mod_devicetable.h | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index fde86671f48f..1bf5900ffe43 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -454,4 +454,13 @@ struct dmi_system_id { | |||
| 454 | 454 | ||
| 455 | #define DMI_MATCH(a, b) { a, b } | 455 | #define DMI_MATCH(a, b) { a, b } |
| 456 | 456 | ||
| 457 | #define PLATFORM_NAME_SIZE 20 | ||
| 458 | #define PLATFORM_MODULE_PREFIX "platform:" | ||
| 459 | |||
| 460 | struct platform_device_id { | ||
| 461 | char name[PLATFORM_NAME_SIZE]; | ||
| 462 | kernel_ulong_t driver_data | ||
| 463 | __attribute__((aligned(sizeof(kernel_ulong_t)))); | ||
| 464 | }; | ||
| 465 | |||
| 457 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 466 | #endif /* LINUX_MOD_DEVICETABLE_H */ |