Revert "local/rtc: s5m: Add support for S2MPS13 RTC"
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Wed, 30 Dec 2015 04:00:36 +0000 (13:00 +0900)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Wed, 14 Dec 2016 04:49:07 +0000 (13:49 +0900)
This reverts commit 70deaddc2d5a8b3efed014f577473d24bedbfb96.

The offending commit was actually an invalid automatic resolution of
conflict (after rebasing on v4.1) and it is duplicating existing device
id entry.

drivers/rtc/rtc-s5m.c

index ed38609..ab60287 100644 (file)
@@ -805,7 +805,6 @@ static const struct platform_device_id s5m_rtc_id[] = {
        { "s5m-rtc",            S5M8767X },
        { "s2mps13-rtc",        S2MPS13X },
        { "s2mps14-rtc",        S2MPS14X },
-       { "s2mps13-rtc",        S2MPS13X },
        { },
 };