diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 23:38:26 (GMT) |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 23:38:26 (GMT) |
| commit | 7f0ff702cdf51472750f4b6042866f1b83a11215 (patch) | |
| tree | 15ce32849cfb8ff3c7205e97a5f76051c08058b0 /arch/arm/plat-s3c | |
| parent | d35b7a829a13b69c4747b69380b504b6544a2375 (diff) | |
| parent | 110d85acd479b80dc11b7fa3abef63285da8ea0c (diff) | |
| download | linux-fsl-qoriq-7f0ff702cdf51472750f4b6042866f1b83a11215.tar.xz | |
ARM: Merge next-samsung-s3c64xx-platdeletion
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung
Conflicts:
arch/arm/mach-s3c64xx/Makefile (fixed)
Diffstat (limited to 'arch/arm/plat-s3c')
| -rw-r--r-- | arch/arm/plat-s3c/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/pm.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c/dma.c b/arch/arm/plat-s3c/dma.c index a995850..606db1a 100644 --- a/arch/arm/plat-s3c/dma.c +++ b/arch/arm/plat-s3c/dma.c @@ -20,8 +20,6 @@ struct s3c2410_dma_buf; #include <mach/dma.h> #include <mach/irqs.h> -#include <plat/dma-plat.h> - /* dma channel state information */ struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS]; struct s3c2410_dma_chan *s3c_dma_chan_map[DMACH_MAX]; diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c index e5eef126..27cfca5 100644 --- a/arch/arm/plat-s3c/pm.c +++ b/arch/arm/plat-s3c/pm.c @@ -29,7 +29,7 @@ #include <asm/irq.h> #include <plat/pm.h> -#include <plat/pm-core.h> +#include <mach/pm-core.h> /* for external use */ |