diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/mod_devicetable.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.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 */ |