diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/powerpc/platforms/pasemi/dma_lib.c | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/powerpc/platforms/pasemi/dma_lib.c')
| -rw-r--r-- | arch/powerpc/platforms/pasemi/dma_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c index 217af321b0c..a6152d92224 100644 --- a/arch/powerpc/platforms/pasemi/dma_lib.c +++ b/arch/powerpc/platforms/pasemi/dma_lib.c | |||
| @@ -509,7 +509,7 @@ fallback: | |||
| 509 | */ | 509 | */ |
| 510 | int pasemi_dma_init(void) | 510 | int pasemi_dma_init(void) |
| 511 | { | 511 | { |
| 512 | static spinlock_t init_lock = SPIN_LOCK_UNLOCKED; | 512 | static DEFINE_SPINLOCK(init_lock); |
| 513 | struct pci_dev *iob_pdev; | 513 | struct pci_dev *iob_pdev; |
| 514 | struct pci_dev *pdev; | 514 | struct pci_dev *pdev; |
| 515 | struct resource res; | 515 | struct resource res; |