diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-s3c2412 | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/mach-s3c2412')
| -rw-r--r-- | arch/arm/mach-s3c2412/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index c2bdc4635d12..9a8c0657ae50 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2412/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| @@ -90,6 +88,4 @@ config MACH_VSTMS | |||
| 90 | help | 88 | help |
| 91 | Say Y here if you are using an VSTMS board | 89 | Say Y here if you are using an VSTMS board |
| 92 | 90 | ||
| 93 | |||
| 94 | endmenu | 91 | endmenu |
| 95 | |||