diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:20:08 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 07:20:08 -0400 |
| commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/mach-s3c64xx/mach-crag6410.c | |
| parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (diff) | |
| parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 (diff) | |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-crag6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 30afaa537fcf..fb3d9cd18156 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include <mach/hardware.h> | 43 | #include <mach/hardware.h> |
| 44 | #include <mach/map.h> | 44 | #include <mach/map.h> |
| 45 | 45 | ||
| 46 | #include <mach/s3c6410.h> | ||
| 47 | #include <mach/regs-sys.h> | 46 | #include <mach/regs-sys.h> |
| 48 | #include <mach/regs-gpio.h> | 47 | #include <mach/regs-gpio.h> |
| 49 | #include <mach/regs-modem.h> | 48 | #include <mach/regs-modem.h> |
| @@ -51,6 +50,7 @@ | |||
| 51 | 50 | ||
| 52 | #include <mach/regs-gpio-memport.h> | 51 | #include <mach/regs-gpio-memport.h> |
| 53 | 52 | ||
| 53 | #include <plat/s3c6410.h> | ||
| 54 | #include <plat/regs-serial.h> | 54 | #include <plat/regs-serial.h> |
| 55 | #include <plat/regs-fb-v4.h> | 55 | #include <plat/regs-fb-v4.h> |
| 56 | #include <plat/fb.h> | 56 | #include <plat/fb.h> |