mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' into for-linus
Conflicts: block/Kconfig Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
commit
b4b7a4ef09
1756 changed files with 63811 additions and 49229 deletions
|
|
@ -475,7 +475,7 @@ static void blk_release_queue(struct kobject *kobj)
|
|||
kmem_cache_free(blk_requestq_cachep, q);
|
||||
}
|
||||
|
||||
static struct sysfs_ops queue_sysfs_ops = {
|
||||
static const struct sysfs_ops queue_sysfs_ops = {
|
||||
.show = queue_attr_show,
|
||||
.store = queue_attr_store,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue