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/mach-s3c2400 | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/mach-s3c2400')
| -rw-r--r-- | arch/arm/mach-s3c2400/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2400/include/mach/map.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2400/Kconfig b/arch/arm/mach-s3c2400/Kconfig index deab0722836e..fdd8f5e96faf 100644 --- a/arch/arm/mach-s3c2400/Kconfig +++ b/arch/arm/mach-s3c2400/Kconfig | |||
| @@ -1,13 +1,7 @@ | |||
| 1 | # arch/arm/mach-s3c2400/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| 6 | 4 | ||
| 7 | |||
| 8 | |||
| 9 | menu "S3C2400 Machines" | 5 | menu "S3C2400 Machines" |
| 10 | 6 | ||
| 11 | |||
| 12 | endmenu | 7 | endmenu |
| 13 | |||
diff --git a/arch/arm/mach-s3c2400/include/mach/map.h b/arch/arm/mach-s3c2400/include/mach/map.h index 1535540edc82..3fd889200e99 100644 --- a/arch/arm/mach-s3c2400/include/mach/map.h +++ b/arch/arm/mach-s3c2400/include/mach/map.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* arch/arm/mach-s3c2400/include/mach/map.h | 1 | /* arch/arm/mach-s3c2400/include/mach/map.h |
| 2 | * | 2 | * |
| 3 | * Copyright 2003,2007 Simtec Electronics | 3 | * Copyright 2003-2007 Simtec Electronics |
| 4 | * http://armlinux.simtec.co.uk/ | 4 | * http://armlinux.simtec.co.uk/ |
| 5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
| 6 | * | 6 | * |