Merge tag 'nfs-for-3.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / drivers / dma / tegra20-apb-dma.c

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 8e0ea2438ce1a39dc1e37fe9f7a4b972f1302d9c..d52dbc6c54abdb346278b65bfbd8715f317d3e58 100644 (file)
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1180,10 +1180,10 @@ static struct tegra_dma_chip_data tegra30_dma_chip_data = {
 
 static const struct of_device_id tegra_dma_of_match[] __devinitconst = {
        {
-               .compatible = "nvidia,tegra30-apbdma-new",
+               .compatible = "nvidia,tegra30-apbdma",
                .data = &tegra30_dma_chip_data,
        }, {
-               .compatible = "nvidia,tegra20-apbdma-new",
+               .compatible = "nvidia,tegra20-apbdma",
                .data = &tegra20_dma_chip_data,
        }, {
        },
@@ -1398,7 +1398,7 @@ static const struct dev_pm_ops tegra_dma_dev_pm_ops __devinitconst = {
 
 static struct platform_driver tegra_dmac_driver = {
        .driver = {
-               .name   = "tegra20-apbdma",
+               .name   = "tegra-apbdma",
                .owner = THIS_MODULE,
                .pm     = &tegra_dma_dev_pm_ops,
                .of_match_table = of_match_ptr(tegra_dma_of_match),