diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-s3c2400/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 | linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz linux-d014d043869cdc591f3a33243d3481fa4479c2d0.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/mach-s3c2400/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c2400/Kconfig | 6 |
1 files changed, 0 insertions, 6 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 @@ -# arch/arm/mach-s3c2400/Kconfig -# # Copyright 2007 Simtec Electronics # # Licensed under GPLv2 - - menu "S3C2400 Machines" - endmenu - |