]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drivers: dma-contiguous: Don't redefine SZ_1M
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Thu, 18 Oct 2012 07:29:44 +0000 (09:29 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 23 Oct 2012 12:05:32 +0000 (14:05 +0200)
Use the definition from linux/sizes.h instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
drivers/base/dma-contiguous.c

index 9a1469474f55addaea1ae5be1f4499187297db06..612afcc5a938f45549ed877ebd6c8ac697315fe3 100644 (file)
 #include <linux/mm.h>
 #include <linux/mutex.h>
 #include <linux/page-isolation.h>
+#include <linux/sizes.h>
 #include <linux/slab.h>
 #include <linux/swap.h>
 #include <linux/mm_types.h>
 #include <linux/dma-contiguous.h>
 
-#ifndef SZ_1M
-#define SZ_1M (1 << 20)
-#endif
-
 struct cma {
        unsigned long   base_pfn;
        unsigned long   count;