diff options
| author | Jiri Kosina | 2009-12-07 18:36:35 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2009-12-07 18:36:35 +0100 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-s3c2440/Kconfig | |
| parent | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | tree-wide: fix misspelling of "definition" in comments (diff) | |
| download | kernel-qcow2-linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.gz kernel-qcow2-linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz kernel-qcow2-linux-d014d043869cdc591f3a33243d3481fa4479c2d0.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
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 a8b69d77571b..ce7bfe4dde22 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -1,5 +1,3 @@ -# arch/arm/mach-s3c2440/Kconfig -# # Copyright 2007 Simtec Electronics # # Licensed under GPLv2 @@ -109,4 +107,3 @@ config MACH_MINI2440 available via various sources. It can come with a 3.5" or 7" touch LCD. endmenu - |