leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'fixes' and 'misc' into for-next

Browse Source
This commit is contained in:
Russell King
2015-10-29 15:21:30 +00:00
parent 9ffecb1028 38850d786a a4283e41bb
commit 116ef0fcc9
28 changed files with 143 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/amba/bus.h
View File

@@ -41,8 +41,6 @@ struct amba_driver {
int (*probe)(struct amba_device *, const struct amba_id *);
int (*remove)(struct amba_device *);
void (*shutdown)(struct amba_device *);
int (*suspend)(struct amba_device *, pm_message_t);
int (*resume)(struct amba_device *);
const struct amba_id *id_table;
};