From 4283f20fa7cf82aa1da5675adb217eb57cda7b7e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 4 Dec 2010 14:53:32 -0800 Subject: [PATCH] --- yaml --- r: 223130 b: refs/heads/master c: cf2f9c59807f173b1c6a537fde7c83c8da876e56 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/intel_mid_dma.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b0ba47e95658..32387e1e6e65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2f5c276ea4b7b7e1b953926bac9d0b148fcce4e +refs/heads/master: cf2f9c59807f173b1c6a537fde7c83c8da876e56 diff --git a/trunk/drivers/dma/intel_mid_dma.c b/trunk/drivers/dma/intel_mid_dma.c index 4c55d451b613..3109bd94bc4f 100644 --- a/trunk/drivers/dma/intel_mid_dma.c +++ b/trunk/drivers/dma/intel_mid_dma.c @@ -1411,7 +1411,7 @@ static const struct dev_pm_ops intel_mid_dma_pm = { .runtime_idle = dma_runtime_idle, }; -static struct pci_driver intel_mid_dma_pci = { +static struct pci_driver intel_mid_dma_pci_driver = { .name = "Intel MID DMA", .id_table = intel_mid_dma_ids, .probe = intel_mid_dma_probe, @@ -1429,13 +1429,13 @@ static int __init intel_mid_dma_init(void) { pr_debug("INFO_MDMA: LNW DMA Driver Version %s\n", INTEL_MID_DMA_DRIVER_VERSION); - return pci_register_driver(&intel_mid_dma_pci); + return pci_register_driver(&intel_mid_dma_pci_driver); } fs_initcall(intel_mid_dma_init); static void __exit intel_mid_dma_exit(void) { - pci_unregister_driver(&intel_mid_dma_pci); + pci_unregister_driver(&intel_mid_dma_pci_driver); } module_exit(intel_mid_dma_exit);