diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-16 20:40:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-16 20:40:27 +0200 |
| commit | d5efccd5b6843c504042735c1e20d9252daefd98 (patch) | |
| tree | 87994943963bf2f34b3f1fa982d909fd82f56746 /drivers/rtc/rtc-efi.c | |
| parent | ASoC: soc-dapm: Use '%llx' with 'u64' type. (diff) | |
| parent | Linux 3.4-rc3 (diff) | |
| download | linux-d5efccd5b6843c504042735c1e20d9252daefd98.tar.xz linux-d5efccd5b6843c504042735c1e20d9252daefd98.zip | |
ASoC: Merge tag 'v3.4-rc3' into for-3.5
Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.
Conflicts:
sound/soc/soc-core.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c
Diffstat (limited to 'drivers/rtc/rtc-efi.c')
| -rw-r--r-- | drivers/rtc/rtc-efi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c index 550292304b0f..c9f890b088da 100644 --- a/drivers/rtc/rtc-efi.c +++ b/drivers/rtc/rtc-efi.c @@ -213,7 +213,6 @@ static struct platform_driver efi_rtc_driver = { .name = "rtc-efi", .owner = THIS_MODULE, }, - .probe = efi_rtc_probe, .remove = __exit_p(efi_rtc_remove), }; |