diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 17:34:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 17:34:58 -0400 |
commit | b32729b1eeae7ef8f5709923b36b5a0906d213df (patch) | |
tree | 20bb9092d2c67569ea4efd95c0df5b8160b8b1a3 /drivers/rtc | |
parent | 091d0d55b286c9340201b4ed4470be87fc568228 (diff) | |
parent | abab8761d095e0805879df48a8ba6ea7f8b31c5e (diff) |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile update from Chris Metcalf:
"The interesting bug fix is support for the upcoming "4.2" release of
the Tilera hypervisor, which by default launches Linux at privilege
level 2 instead of 1. The fix lets new and old hypervisors and
Linuxes interoperate more smoothly, so I've tagged it for
stable@kernel.org so that older Linuxes will be able to boot under the
newer hypervisor."
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
usb: tilegx: fix memleak when create hcd fail
arch/tile: remove inline marking of EXPORT_SYMBOL functions
rtc: rtc-tile: add missing platform_device_unregister() when module exit
tile: support new Tilera hypervisor
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-tile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-tile.c b/drivers/rtc/rtc-tile.c index 249b6531f119..fc3dee95f166 100644 --- a/drivers/rtc/rtc-tile.c +++ b/drivers/rtc/rtc-tile.c | |||
@@ -146,6 +146,7 @@ exit_driver_unregister: | |||
146 | */ | 146 | */ |
147 | static void __exit tile_rtc_driver_exit(void) | 147 | static void __exit tile_rtc_driver_exit(void) |
148 | { | 148 | { |
149 | platform_device_unregister(tile_rtc_platform_device); | ||
149 | platform_driver_unregister(&tile_rtc_platform_driver); | 150 | platform_driver_unregister(&tile_rtc_platform_driver); |
150 | } | 151 | } |
151 | 152 | ||