diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /arch/ia64/sn/pci/pcibr/pcibr_dma.c | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/sn/pci/pcibr/pcibr_dma.c')
| -rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c index c90685985d81..64af2b2c1787 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c | |||
| @@ -301,7 +301,7 @@ void sn_dma_flush(uint64_t addr) | |||
| 301 | spin_lock_irqsave(&((struct sn_flush_device_list *)p)-> | 301 | spin_lock_irqsave(&((struct sn_flush_device_list *)p)-> |
| 302 | sfdl_flush_lock, flags); | 302 | sfdl_flush_lock, flags); |
| 303 | 303 | ||
| 304 | p->sfdl_flush_value = 0; | 304 | *p->sfdl_flush_addr = 0; |
| 305 | 305 | ||
| 306 | /* force an interrupt. */ | 306 | /* force an interrupt. */ |
| 307 | *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1; | 307 | *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1; |