diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 01:58:01 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 01:58:01 -0700 |
| commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
| tree | bbe0d083829f5858295298f188d885367cf4b1f6 /include/linux/device.h | |
| parent | Input: appletouch - improve finger detection (diff) | |
| parent | Linux 2.6.30 (diff) | |
| download | linux-dev-4894e4aca82aca927d0404ce61f021f790de4b1e.tar.xz linux-dev-4894e4aca82aca927d0404ce61f021f790de4b1e.zip | |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 6a69caaac18a..5d5c197bad45 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 |