mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'smp' into misc
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
This commit is contained in:
commit
4ec3eb1363
1391 changed files with 25581 additions and 12331 deletions
|
|
@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/
|
|||
|
||||
# char/ comes before serial/ etc so that the VT console is the boot-time
|
||||
# default.
|
||||
obj-y += tty/
|
||||
obj-y += char/
|
||||
|
||||
# gpu/ comes after char for AGP vs DRM startup
|
||||
|
|
|
|||
Loading…
Reference in a new issue