diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 10:49:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 10:49:31 -0700 |
| commit | 0016effb90589a87290a2ee721e34dc37e87b67c (patch) | |
| tree | 6e52adab5fd775a62edfad7f373916b8d1b31ba6 /include | |
| parent | 93b49d45eb97574057ee03dfdd590c209f5132f8 (diff) | |
| parent | e67c85626cd02e306da1b4195bfaf68d61050796 (diff) | |
| download | linux-3.10-0016effb90589a87290a2ee721e34dc37e87b67c.tar.gz linux-3.10-0016effb90589a87290a2ee721e34dc37e87b67c.tar.bz2 linux-3.10-0016effb90589a87290a2ee721e34dc37e87b67c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Revert driver core: move platform_data into platform_device
Revert driver core: fix passing platform_data
Remove old PRINTK_DEBUG config item
Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense
Driver core: platform: fix kernel-doc warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 9 | ||||
| -rw-r--r-- | include/linux/platform_device.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 6a69caaac18..5d5c197bad4 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -384,13 +384,8 @@ struct device { struct device_driver *driver; /* which driver has allocated this device */ void *driver_data; /* data private to the driver */ - - void *platform_data; /* We will remove platform_data - field if all platform devices - pass its platform specific data - from platform_device->platform_data, - other kind of devices should not - use platform_data. */ + void *platform_data; /* Platform specific data, device + core doesn't touch it */ struct dev_pm_info power; #ifdef CONFIG_NUMA diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 72736fd8223..b67bb5d7b22 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -20,7 +20,6 @@ struct platform_device { struct device dev; u32 num_resources; struct resource * resource; - void *platform_data; struct platform_device_id *id_entry; }; |