diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/arm/mach-s3c2440/Kconfig | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/arm/mach-s3c2440/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index cf10e14b7b49..80879358eb2f 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2440/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| @@ -122,4 +120,3 @@ config MACH_MINI2440 | |||
| 122 | available via various sources. It can come with a 3.5" or 7" touch LCD. | 120 | available via various sources. It can come with a 3.5" or 7" touch LCD. |
| 123 | 121 | ||
| 124 | endmenu | 122 | endmenu |
| 125 | |||