Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
This commit is contained in:
commit
f093182d31
88 changed files with 5140 additions and 585 deletions
|
|
@ -139,15 +139,12 @@ extern void proc_tty_unregister_driver(struct tty_driver *driver);
|
|||
/*
|
||||
* proc_devtree.c
|
||||
*/
|
||||
struct device_node;
|
||||
extern void proc_device_tree_init(void);
|
||||
#ifdef CONFIG_PROC_DEVICETREE
|
||||
struct device_node;
|
||||
struct property;
|
||||
extern void proc_device_tree_init(void);
|
||||
extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *);
|
||||
#else /* !CONFIG_PROC_DEVICETREE */
|
||||
static inline void proc_device_tree_add_node(struct device_node *np, struct proc_dir_entry *pde)
|
||||
{
|
||||
return;
|
||||
}
|
||||
extern void proc_device_tree_add_prop(struct proc_dir_entry *pde, struct property *prop);
|
||||
#endif /* CONFIG_PROC_DEVICETREE */
|
||||
|
||||
extern struct proc_dir_entry *proc_symlink(const char *,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue