forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin' into irqdomain/next

Browse source
This commit is contained in:
Grant Likely 2012-07-24 22:31:09 -06:00
commit 6aeea3ecc3
4548 changed files with 182111 additions and 105418 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/of.h
View file

@ -261,8 +261,7 @@ extern int of_machine_is_compatible(const char *compat);
extern int prom_add_property(struct device_node* np, struct property* prop);
extern int prom_remove_property(struct device_node *np, struct property *prop);
extern int prom_update_property(struct device_node *np,
struct property *newprop,
struct property *oldprop);
struct property *newprop);
#if defined(CONFIG_OF_DYNAMIC)
/* For updating the device tree at runtime */