diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 05:40:38 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 05:40:38 +0000 |
commit | 0dcd627896fb87b2e78a1ed78e469591208cffcd (patch) | |
tree | e7cf361144599ac2e80c00268466e4308edf652b /drivers/i2c | |
parent | 72053353583230952c4b187e110e9da00dfc3afb (diff) | |
parent | 0783a9bf4a5207e9d57b8c110022957f8dc88e2a (diff) | |
download | op-kernel-dev-0dcd627896fb87b2e78a1ed78e469591208cffcd.zip op-kernel-dev-0dcd627896fb87b2e78a1ed78e469591208cffcd.tar.gz |
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/i2c')
-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 6381604..0ab4a95 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); static struct platform_driver tegra_i2c_driver = { .probe = tegra_i2c_probe, - .remove = tegra_i2c_remove, + .remove = __devexit_p(tegra_i2c_remove), #ifdef CONFIG_PM .suspend = tegra_i2c_suspend, .resume = tegra_i2c_resume, |