Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[~andy/linux] / drivers / dma / pch_dma.c

diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index bf2ddd601dc22113c4584f0a0e45f6ecdc3456f5..8d8fef1480a93115ab17c51f6c97d0130b44b21d 100644 (file)
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -82,7 +82,7 @@ struct pch_dma_regs {
        u32     dma_sts1;
        u32     reserved2;
        u32     reserved3;
-       struct pch_dma_desc_regs desc[0];
+       struct pch_dma_desc_regs desc[MAX_CHAN_NR];
 };
 
 struct pch_dma_desc {
@@ -124,7 +124,7 @@ struct pch_dma {
        struct pci_pool         *pool;
        struct pch_dma_regs     regs;
        struct pch_dma_desc_regs ch_regs[MAX_CHAN_NR];
-       struct pch_dma_chan     channels[0];
+       struct pch_dma_chan     channels[MAX_CHAN_NR];
 };
 
 #define PCH_DMA_CTL0   0x00
@@ -693,6 +693,7 @@ static irqreturn_t pd_irq(int irq, void *devid)
        return ret;
 }
 
+#ifdef CONFIG_PM
 static void pch_dma_save_regs(struct pch_dma *pd)
 {
        struct pch_dma_chan *pd_chan;
@@ -770,6 +771,7 @@ static int pch_dma_resume(struct pci_dev *pdev)
 
        return 0;
 }
+#endif
 
 static int __devinit pch_dma_probe(struct pci_dev *pdev,
                                   const struct pci_device_id *id)