A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' into efi-next-merge

Browse source 
Conflicts:
	arch/x86/boot/compressed/eboot.c
This commit is contained in:
Matt Fleming 2014-10-03 22:15:56 +01:00
commit 75b128573b
20 changed files with 528 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/rtc/Kconfig
View file

@ -806,7 +806,7 @@ config RTC_DRV_DA9063
config RTC_DRV_EFI
tristate "EFI RTC"
depends on EFI
depends on EFI && !X86
help
If you say yes here you will get support for the EFI
Real Time Clock.

1
drivers/rtc/rtc-efi.c
View file

@ -236,3 +236,4 @@ MODULE_ALIAS("platform:rtc-efi");
MODULE_AUTHOR("dann frazier <[email protected]>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("EFI RTC driver");
MODULE_ALIAS("platform:rtc-efi");