diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:31:09 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:34:40 -0400 |
| commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
| tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /include/linux/of.h | |
| parent | 9844a5524ec532aee826c35e3031637c7fc8287b (diff) | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 76930ee78db5..e6c6b167949d 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
| @@ -261,8 +261,7 @@ extern int of_machine_is_compatible(const char *compat); | |||
| 261 | extern int prom_add_property(struct device_node* np, struct property* prop); | 261 | extern int prom_add_property(struct device_node* np, struct property* prop); |
| 262 | extern int prom_remove_property(struct device_node *np, struct property *prop); | 262 | extern int prom_remove_property(struct device_node *np, struct property *prop); |
| 263 | extern int prom_update_property(struct device_node *np, | 263 | extern int prom_update_property(struct device_node *np, |
| 264 | struct property *newprop, | 264 | struct property *newprop); |
| 265 | struct property *oldprop); | ||
| 266 | 265 | ||
| 267 | #if defined(CONFIG_OF_DYNAMIC) | 266 | #if defined(CONFIG_OF_DYNAMIC) |
| 268 | /* For updating the device tree at runtime */ | 267 | /* For updating the device tree at runtime */ |