diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/plat-s3c24xx/cpu.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/plat-s3c24xx/cpu.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index 4af9dd948793..9ca64df35bf6 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
| @@ -49,9 +49,7 @@ | |||
| 49 | #include <plat/s3c2400.h> | 49 | #include <plat/s3c2400.h> |
| 50 | #include <plat/s3c2410.h> | 50 | #include <plat/s3c2410.h> |
| 51 | #include <plat/s3c2412.h> | 51 | #include <plat/s3c2412.h> |
| 52 | #include "s3c244x.h" | 52 | #include <plat/s3c244x.h> |
| 53 | #include <plat/s3c2440.h> | ||
| 54 | #include <plat/s3c2442.h> | ||
| 55 | #include <plat/s3c2443.h> | 53 | #include <plat/s3c2443.h> |
| 56 | 54 | ||
| 57 | /* table of supported CPUs */ | 55 | /* table of supported CPUs */ |