aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:33:54 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:33:54 +0000
commit602fd7c36728a04e61a442c9755e7d454501266c (patch)
tree6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/Kconfig
parentd7931d9f7ab9de9158c6905caae979999134ad4d (diff)
parent88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff)
downloadlinux-2.6.34-ux500-602fd7c36728a04e61a442c9755e7d454501266c.tar.gz
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/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 62152ae3475..7d0818797c8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -760,6 +760,7 @@ source "arch/arm/mach-kirkwood/Kconfig"
source "arch/arm/mach-dove/Kconfig"
+source "arch/arm/plat-samsung/Kconfig"
source "arch/arm/plat-s3c24xx/Kconfig"
source "arch/arm/plat-s3c64xx/Kconfig"
source "arch/arm/plat-s3c/Kconfig"