diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 1bf5cf0b4513..144ec135875f 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -128,9 +128,7 @@ struct device_driver { | |||
128 | 128 | ||
129 | bool suppress_bind_attrs; /* disables bind/unbind via sysfs */ | 129 | bool suppress_bind_attrs; /* disables bind/unbind via sysfs */ |
130 | 130 | ||
131 | #if defined(CONFIG_OF) | ||
132 | const struct of_device_id *of_match_table; | 131 | const struct of_device_id *of_match_table; |
133 | #endif | ||
134 | 132 | ||
135 | int (*probe) (struct device *dev); | 133 | int (*probe) (struct device *dev); |
136 | int (*remove) (struct device *dev); | 134 | int (*remove) (struct device *dev); |
@@ -422,6 +420,7 @@ struct device { | |||
422 | void *platform_data; /* Platform specific data, device | 420 | void *platform_data; /* Platform specific data, device |
423 | core doesn't touch it */ | 421 | core doesn't touch it */ |
424 | struct dev_pm_info power; | 422 | struct dev_pm_info power; |
423 | struct dev_power_domain *pwr_domain; | ||
425 | 424 | ||
426 | #ifdef CONFIG_NUMA | 425 | #ifdef CONFIG_NUMA |
427 | int numa_node; /* NUMA node this device is close to */ | 426 | int numa_node; /* NUMA node this device is close to */ |
@@ -441,9 +440,9 @@ struct device { | |||
441 | override */ | 440 | override */ |
442 | /* arch specific additions */ | 441 | /* arch specific additions */ |
443 | struct dev_archdata archdata; | 442 | struct dev_archdata archdata; |
444 | #ifdef CONFIG_OF | 443 | |
445 | struct device_node *of_node; | 444 | struct device_node *of_node; /* associated device tree node */ |
446 | #endif | 445 | const struct of_device_id *of_match; /* matching of_device_id from driver */ |
447 | 446 | ||
448 | dev_t devt; /* dev_t, creates the sysfs "dev" */ | 447 | dev_t devt; /* dev_t, creates the sysfs "dev" */ |
449 | 448 | ||