diff options
| author | Huang Shijie <b32955@freescale.com> | 2012-02-01 15:26:54 +0800 |
|---|---|---|
| committer | Huang Shijie <b32955@freescale.com> | 2012-02-07 16:13:06 +0800 |
| commit | 85d9a42075c9a9b05a5c65c8433d3b3b6757bb01 (patch) | |
| tree | 89c920ee5a12f00b398f52fc7258d48b7ace72ea | |
| parent | 4f0fb8e59f27cdf0bbdb0a6c2155389884624ef9 (diff) | |
ENGR00173731-2 mxs-dma : use the new mxs-dma.h
use the new header : mxs-dma.h.
Signed-off-by: Huang Shijie <b32955@freescale.com>
| -rw-r--r-- | drivers/dma/mxs-dma.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index b06cd4ca626f..9e819a138615 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. * * Refer to drivers/dma/imx-sdma.c * @@ -22,10 +22,10 @@ #include <linux/platform_device.h> #include <linux/dmaengine.h> #include <linux/delay.h> +#include <linux/mxs-dma.h> #include <asm/irq.h> #include <mach/mxs.h> -#include <mach/dma.h> #include <mach/common.h> /* diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h index e023bccb7781..b4a426a19564 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h @@ -1,7 +1,7 @@ /* * Freescale GPMI NAND Flash Driver * - * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. * Copyright (C) 2008 Embedded Alley Solutions, Inc. * * This program is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ #include <linux/mtd/nand.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <mach/dma.h> +#include <linux/mxs-dma.h> struct resources { void *gpmi_regs; |