diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
| commit | 31881d74b6dd1a6c530cff61248def4f2da38bee (patch) | |
| tree | be62420cf39192074e13b25553d172b9d5e58a33 /arch/arm/mach-s3c24xx/clock-s3c2412.c | |
| parent | 8855f30cd2b68012571932c7b01290c20be4508c (diff) | |
| parent | 257867dc8d893690c175c1f717f91c3b6d44a63d (diff) | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Pull in changes from Henrik: "a trivial MT documentation fix".
Diffstat (limited to 'arch/arm/mach-s3c24xx/clock-s3c2412.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2412.c b/arch/arm/mach-s3c24xx/clock-s3c2412.c index d10b695a9066..2cc017da88fe 100644 --- a/arch/arm/mach-s3c24xx/clock-s3c2412.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2412.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <mach/regs-clock.h> | 41 | #include <mach/regs-clock.h> |
| 42 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
| 43 | 43 | ||
| 44 | #include <plat/s3c2412.h> | ||
| 45 | #include <plat/clock.h> | 44 | #include <plat/clock.h> |
| 46 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
| 47 | 46 | ||