diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 23:15:56 +0200 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 23:15:56 +0200 |
| commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 (patch) | |
| tree | e607db32fd303246ee9b93af83a611fc7b93479a /drivers/rtc/rtc-efi.c | |
| parent | Linux 3.17-rc7 (diff) | |
| parent | rtc: Disable EFI rtc for x86 (diff) | |
| download | linux-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.tar.xz linux-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.zip | |
Merge branch 'next' into efi-next-merge
Conflicts:
arch/x86/boot/compressed/eboot.c
Diffstat (limited to 'drivers/rtc/rtc-efi.c')
| -rw-r--r-- | drivers/rtc/rtc-efi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c index c384fec6d173..53b589dc34eb 100644 --- a/drivers/rtc/rtc-efi.c +++ b/drivers/rtc/rtc-efi.c @@ -236,3 +236,4 @@ MODULE_ALIAS("platform:rtc-efi"); MODULE_AUTHOR("dann frazier <dannf@hp.com>"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("EFI RTC driver"); +MODULE_ALIAS("platform:rtc-efi"); |