diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:33:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:33:54 -0500 |
| commit | 602fd7c36728a04e61a442c9755e7d454501266c (patch) | |
| tree | 6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/Kconfig | |
| parent | d7931d9f7ab9de9158c6905caae979999134ad4d (diff) | |
| parent | 88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff) | |
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 62152ae34758..7d0818797c85 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -760,6 +760,7 @@ source "arch/arm/mach-kirkwood/Kconfig" | |||
| 760 | 760 | ||
| 761 | source "arch/arm/mach-dove/Kconfig" | 761 | source "arch/arm/mach-dove/Kconfig" |
| 762 | 762 | ||
| 763 | source "arch/arm/plat-samsung/Kconfig" | ||
| 763 | source "arch/arm/plat-s3c24xx/Kconfig" | 764 | source "arch/arm/plat-s3c24xx/Kconfig" |
| 764 | source "arch/arm/plat-s3c64xx/Kconfig" | 765 | source "arch/arm/plat-s3c64xx/Kconfig" |
| 765 | source "arch/arm/plat-s3c/Kconfig" | 766 | source "arch/arm/plat-s3c/Kconfig" |