Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / pasemi / dma_lib.c

diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index 217af321b0ca4d95b1c9aa2a9a39afbe68d98c7f..09695ae50f911c521766ad41fc938c1c05642b1b 100644 (file)
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/of.h>
 
 #include <asm/pasemi_dma.h>
@@ -509,7 +510,7 @@ fallback:
  */
 int pasemi_dma_init(void)
 {
-       static spinlock_t init_lock = SPIN_LOCK_UNLOCKED;
+       static DEFINE_SPINLOCK(init_lock);
        struct pci_dev *iob_pdev;
        struct pci_dev *pdev;
        struct resource res;