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-s3c2400 | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/mach-s3c2400')
| -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 @@ | |||
| 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 | |||