Merge branch 'hid-suspend' into picolcd

[pandora-kernel.git] / arch / sh / include / asm / dma-mapping.h

diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
index 87ced13..bea3337 100644 (file)
--- a/arch/sh/include/asm/dma-mapping.h
+++ b/arch/sh/include/asm/dma-mapping.h
@@ -89,8 +89,6 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
 {
        struct dma_map_ops *ops = get_dma_ops(dev);
 
-       WARN_ON(irqs_disabled());       /* for portability */
-
        if (dma_release_from_coherent(dev, get_order(size), vaddr))
                return;