diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:23:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:23:11 -0700 |
| commit | 7e95c548818d2b311090848083277fb907cfb56d (patch) | |
| tree | 86fecf07ae1f01ba8bac5969974a7915b738baee /drivers/rtc/rtc-ab8500.c | |
| parent | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (diff) | |
| parent | 99261fbad0a16f105b262d7525801697588ba526 (diff) | |
| download | lwn-7e95c548818d2b311090848083277fb907cfb56d.tar.gz lwn-7e95c548818d2b311090848083277fb907cfb56d.zip | |
Merge branch 'next/dt' into HEAD
Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
Diffstat (limited to 'drivers/rtc/rtc-ab8500.c')
| -rw-r--r-- | drivers/rtc/rtc-ab8500.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index bf3c2f669c3c..2e5970fe9eeb 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -462,16 +462,10 @@ static int __devexit ab8500_rtc_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id ab8500_rtc_match[] = { - { .compatible = "stericsson,ab8500-rtc", }, - {} -}; - static struct platform_driver ab8500_rtc_driver = { .driver = { .name = "ab8500-rtc", .owner = THIS_MODULE, - .of_match_table = ab8500_rtc_match, }, .probe = ab8500_rtc_probe, .remove = __devexit_p(ab8500_rtc_remove), |