diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 00:40:38 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 00:40:38 -0500 |
| commit | 0dcd627896fb87b2e78a1ed78e469591208cffcd (patch) | |
| tree | e7cf361144599ac2e80c00268466e4308edf652b /drivers | |
| parent | 72053353583230952c4b187e110e9da00dfc3afb (diff) | |
| parent | 0783a9bf4a5207e9d57b8c110022957f8dc88e2a (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
ARM: tegra: paz00: fix wrong SD1 power gpio
i2c: tegra: Add devexit_p() for remove
ARM: tegra: dma: fix buildbreak for !CONFIG_TEGRA_SYSTEM_DMA
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 6381604696d3..0ab4a9548745 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c | |||
| @@ -755,7 +755,7 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); | |||
| 755 | 755 | ||
| 756 | static struct platform_driver tegra_i2c_driver = { | 756 | static struct platform_driver tegra_i2c_driver = { |
| 757 | .probe = tegra_i2c_probe, | 757 | .probe = tegra_i2c_probe, |
| 758 | .remove = tegra_i2c_remove, | 758 | .remove = __devexit_p(tegra_i2c_remove), |
| 759 | #ifdef CONFIG_PM | 759 | #ifdef CONFIG_PM |
| 760 | .suspend = tegra_i2c_suspend, | 760 | .suspend = tegra_i2c_suspend, |
| 761 | .resume = tegra_i2c_resume, | 761 | .resume = tegra_i2c_resume, |