Commit 2f774456 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix floppy build failure.
parents 5b3c1184 78ad0b84
...@@ -15,17 +15,6 @@ ...@@ -15,17 +15,6 @@
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/oplib.h> #include <asm/oplib.h>
extern spinlock_t dma_spin_lock;
#define claim_dma_lock() \
({ unsigned long flags; \
spin_lock_irqsave(&dma_spin_lock, flags); \
flags; \
})
#define release_dma_lock(__flags) \
spin_unlock_irqrestore(&dma_spin_lock, __flags);
/* These are irrelevant for Sparc DMA, but we leave it in so that /* These are irrelevant for Sparc DMA, but we leave it in so that
* things can compile. * things can compile.
*/ */
......
...@@ -854,4 +854,15 @@ static unsigned long __init sun_floppy_init(void) ...@@ -854,4 +854,15 @@ static unsigned long __init sun_floppy_init(void)
#define EXTRA_FLOPPY_PARAMS #define EXTRA_FLOPPY_PARAMS
static DEFINE_SPINLOCK(dma_spin_lock);
#define claim_dma_lock() \
({ unsigned long flags; \
spin_lock_irqsave(&dma_spin_lock, flags); \
flags; \
})
#define release_dma_lock(__flags) \
spin_unlock_irqrestore(&dma_spin_lock, __flags);
#endif /* !(__ASM_SPARC64_FLOPPY_H) */ #endif /* !(__ASM_SPARC64_FLOPPY_H) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment