diff options
| author | Chris Ball | 2013-03-19 13:07:13 -0400 |
|---|---|---|
| committer | Chris Ball | 2013-03-19 13:07:13 -0400 |
| commit | 2c06aeb25ca92b839399c4e2c956cffc95b41978 (patch) | |
| tree | 3fb5007eac3adb9d4c973978c3b084fa077e926b /drivers/watchdog/gef_wdt.c | |
| parent | 9665f7f234d095fc7c28c70df819a3f7b6a7b4e8 (diff) | |
| parent | 908ab9368866e6edf0edebdd546adefd5f3128f9 (diff) | |
Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into mmc-next
ARM: tegra: DT-related fixes needed by the MMC tree
In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.
Diffstat (limited to 'drivers/watchdog/gef_wdt.c')
| -rw-r--r-- | drivers/watchdog/gef_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c index b9c5b58e59d3..257cfbad21da 100644 --- a/drivers/watchdog/gef_wdt.c +++ b/drivers/watchdog/gef_wdt.c @@ -310,6 +310,7 @@ static struct platform_driver gef_wdt_driver = { .of_match_table = gef_wdt_ids, }, .probe = gef_wdt_probe, + .remove = gef_wdt_remove, }; static int __init gef_wdt_init(void) |