diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:12:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:12:25 +1100 |
| commit | 0977974f60ffa341a89e12e8fc5640094eeef4a9 (patch) | |
| tree | 2447b939fabdb3b480d8a96d5beb4b6b3602746a /drivers/dma | |
| parent | f64b6501aab19d1e2842b5cf9ff8e37a98c8f67a (diff) | |
| parent | fa9f90be745d3b600a9d97a063be404c5e5d9071 (diff) | |
Merge remote branch 'trivial/for-next'
Conflicts:
MAINTAINERS
drivers/scsi/bfa/bfa_fcpim.c
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/intel_mid_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c index 5397d8535e0a..798f46a4590d 100644 --- a/drivers/dma/intel_mid_dma.c +++ b/drivers/dma/intel_mid_dma.c @@ -1075,8 +1075,8 @@ static irqreturn_t intel_mid_dma_interrupt2(int irq, void *data) * mid_setup_dma - Setup the DMA controller * @pdev: Controller PCI device structure * - * Initilize the DMA controller, channels, registers with DMA engine, - * ISR. Initilize DMA controller channels. + * Initialize the DMA controller, channels, registers with DMA engine, + * ISR. Initialize DMA controller channels. */ static int mid_setup_dma(struct pci_dev *pdev) { @@ -1232,7 +1232,7 @@ static void middma_shutdown(struct pci_dev *pdev) * @pdev: Controller PCI device structure * @id: pci device id structure * - * Initilize the PCI device, map BARs, query driver data. + * Initialize the PCI device, map BARs, query driver data. * Call setup_dma to complete contoller and chan initilzation */ static int __devinit intel_mid_dma_probe(struct pci_dev *pdev, |