From 5656d0325b461b4b0f90d4c0544b90a64f82faa6 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Mon, 2 Jul 2012 13:52:08 +0530 Subject: [PATCH] --- yaml --- r: 316651 b: refs/heads/master c: cd9092c6eabe898ff5aeb1c14c2509ea9d1f0080 h: refs/heads/master i: 316649: fc0a3ac2096b812877ed0e03dc4a44370d7ef7de 316647: 9f5b38b4943b7707eab8e8ae5f5484f006b1eb8c v: v3 --- [refs] | 2 +- trunk/drivers/dma/tegra20-apb-dma.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 508f9ba1eacb..236ae3638dc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a46ba36e25dcff1d30eb1681135c3c10af71c16 +refs/heads/master: cd9092c6eabe898ff5aeb1c14c2509ea9d1f0080 diff --git a/trunk/drivers/dma/tegra20-apb-dma.c b/trunk/drivers/dma/tegra20-apb-dma.c index 8e0ea2438ce1..d52dbc6c54ab 100644 --- a/trunk/drivers/dma/tegra20-apb-dma.c +++ b/trunk/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),