diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:17:10 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:27:04 -0400 |
| commit | 45c79433c02b8fe7b8a1cbf60548a9798d0502ed (patch) | |
| tree | 51ff899371af78df9ced0eee3973fdfdb512c905 /arch/arm/mach-s5pc100/dma.c | |
| parent | c5e2caca6a0732108bec146844551767cfbc115c (diff) | |
ARM: S5PC100: Fixup merge problems
Between problems with Kconfig and merging commits from several
different sources, it seems the s5pc100 build's move from plat-s5pc11
has had a few problems.
Since I do not have the trees to rebuild this quickly, the easiest
thing is to simply fix the errors found once the s5pc100_defconfig
actually builds.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s5pc100/dma.c')
| -rw-r--r-- | arch/arm/mach-s5pc100/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c index 8e7af46bba09..0f5517571e2c 100644 --- a/arch/arm/mach-s5pc100/dma.c +++ b/arch/arm/mach-s5pc100/dma.c | |||
| @@ -21,9 +21,9 @@ | |||
| 21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 22 | 22 | ||
| 23 | #include <plat/devs.h> | 23 | #include <plat/devs.h> |
| 24 | #include <plat/irqs.h> | ||
| 25 | 24 | ||
| 26 | #include <mach/map.h> | 25 | #include <mach/map.h> |
| 26 | #include <mach/irqs.h> | ||
| 27 | 27 | ||
| 28 | #include <plat/s3c-pl330-pdata.h> | 28 | #include <plat/s3c-pl330-pdata.h> |
| 29 | 29 | ||