Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 3 insertions, 5 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 99fdc736698c..63a30d1dd425 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -7,6 +7,7 @@
 config CPU_S3C2410
         bool
         depends on ARCH_S3C2410
+        select CPU_ARM920T
         select S3C2410_CLOCK
         select S3C2410_GPIO
         select CPU_LLSERIAL_S3C2410
@@ -32,11 +33,6 @@ config S3C2410_GPIO
         help
           GPIO code for S3C2410 and similar processors
 
-config S3C2410_CLOCK
-        bool
-        help
-          Clock code for the S3C2410, and similar processors
-
 config SIMTEC_NOR
         bool
         help
@@ -84,6 +80,7 @@ config ARCH_BAST
         select PM_SIMTEC if PM
         select SIMTEC_NOR
         select MACH_BAST_IDE
+        select S3C24XX_DCLK
         select ISA
         help
           Say Y here if you are using the Simtec Electronics EB2410ITX
@@ -121,6 +118,7 @@ config MACH_TCT_HAMMER
 config MACH_VR1000
         bool "Thorcom VR1000"
         select PM_SIMTEC if PM
+        select S3C24XX_DCLK
         select SIMTEC_NOR
         select MACH_BAST_IDE
         select CPU_S3C2410