mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'drivers-platform' into release
Conflicts: drivers/misc/Kconfig Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
d97c0defba
25 changed files with 409 additions and 382 deletions
|
|
@ -105,3 +105,4 @@ obj-$(CONFIG_OF) += of/
|
|||
obj-$(CONFIG_SSB) += ssb/
|
||||
obj-$(CONFIG_VIRTIO) += virtio/
|
||||
obj-$(CONFIG_STAGING) += staging/
|
||||
obj-y += platform/
|
||||
|
|
|
|||
Loading…
Reference in a new issue