diff options
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 1bf5cf0b451..ca5d25225aa 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); |
| @@ -441,9 +439,8 @@ struct device { | |||
| 441 | override */ | 439 | override */ |
| 442 | /* arch specific additions */ | 440 | /* arch specific additions */ |
| 443 | struct dev_archdata archdata; | 441 | struct dev_archdata archdata; |
| 444 | #ifdef CONFIG_OF | 442 | |
| 445 | struct device_node *of_node; | 443 | struct device_node *of_node; /* associated device tree node */ |
| 446 | #endif | ||
| 447 | 444 | ||
| 448 | dev_t devt; /* dev_t, creates the sysfs "dev" */ | 445 | dev_t devt; /* dev_t, creates the sysfs "dev" */ |
| 449 | 446 | ||
