summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440/dsc.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 20:23:46 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 20:23:46 +0300
commit74511020dde10252f8b8e648690d99dba721de14 (patch)
tree04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/arm/mach-s3c2440/dsc.c
parent69266866a5790080d7fe80094b28d670ff8aa765 (diff)
parent3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff)
downloadlinux-74511020dde10252f8b8e648690d99dba721de14.tar.xz
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'arch/arm/mach-s3c2440/dsc.c')
-rw-r--r--arch/arm/mach-s3c2440/dsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c
index 554044272771..9ea66e31f626 100644
--- a/arch/arm/mach-s3c2440/dsc.c
+++ b/arch/arm/mach-s3c2440/dsc.c
@@ -28,7 +28,7 @@
#include <mach/regs-dsc.h>
#include <plat/cpu.h>
-#include <plat/s3c2440.h>
+#include <plat/s3c244x.h>
int s3c2440_set_dsc(unsigned int pin, unsigned int value)
{