Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / mach-s3c24xx / Kconfig

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 9eb2229..79c49ff 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -29,7 +29,6 @@ config CPU_S3C2410
        default y
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
-       select S3C2410_DMA if S3C24XX_DMA
        select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
        select S3C2410_PM if PM
        help
@@ -40,7 +39,6 @@ config CPU_S3C2412
        bool "SAMSUNG S3C2412"
        select CPU_ARM926T
        select S3C2412_COMMON_CLK
-       select S3C2412_DMA if S3C24XX_DMA
        select S3C2412_PM if PM
        help
          Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
@@ -50,7 +48,6 @@ config CPU_S3C2416
        select CPU_ARM926T
        select S3C2416_PM if PM
        select S3C2443_COMMON_CLK
-       select S3C2443_DMA if S3C24XX_DMA
        help
          Support for the S3C2416 SoC from the S3C24XX line
 
@@ -59,7 +56,6 @@ config CPU_S3C2440
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
        select S3C2410_PM if PM
-       select S3C2440_DMA if S3C24XX_DMA
        help
          Support for S3C2440 Samsung Mobile CPU based systems.
 
@@ -67,7 +63,6 @@ config CPU_S3C2442
        bool "SAMSUNG S3C2442"
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
-       select S3C2410_DMA if S3C24XX_DMA
        select S3C2410_PM if PM
        help
          Support for S3C2442 Samsung Mobile CPU based systems.
@@ -80,7 +75,6 @@ config CPU_S3C2443
        bool "SAMSUNG S3C2443"
        select CPU_ARM920T
        select S3C2443_COMMON_CLK
-       select S3C2443_DMA if S3C24XX_DMA
        help
          Support for the S3C2443 SoC from the S3C24XX line
 
@@ -114,27 +108,6 @@ config S3C24XX_SETUP_TS
        help
          Compile in platform device definition for Samsung TouchScreen.
 
-config S3C24XX_DMA
-       bool "S3C2410 DMA support (deprecated)"
-       select S3C_DMA
-       help
-         S3C2410 DMA support. This is needed for drivers like sound which
-         use the S3C2410's DMA system to move data to and from the
-         peripheral blocks.
-
-config S3C2410_DMA_DEBUG
-       bool "S3C2410 DMA support debug"
-       depends on S3C2410_DMA
-       help
-         Enable debugging output for the DMA code. This option sends info
-         to the kernel log, at priority KERN_DEBUG.
-
-config S3C2410_DMA
-       bool
-       depends on S3C24XX_DMA && (CPU_S3C2410 || CPU_S3C2442)
-       help
-         DMA device selection for S3C2410 and compatible CPUs
-
 config S3C2410_PM
        bool
        help
@@ -325,11 +298,6 @@ config CPU_S3C2412_ONLY
                   !CPU_S3C2442 && !CPU_S3C2443
        default y
 
-config S3C2412_DMA
-       bool
-       help
-         Internal config node for S3C2412 DMA support
-
 config S3C2412_PM
        bool
        select S3C2412_PM_SLEEP
@@ -438,11 +406,6 @@ endif      # CPU_S3C2416
 
 if CPU_S3C2440
 
-config S3C2440_DMA
-       bool
-       help
-         Support for S3C2440 specific DMA code5A
-
 config S3C2440_XTAL_12000000
        bool
        help
@@ -601,11 +564,6 @@ endif      # CPU_S3C2442
 
 if CPU_S3C2443 || CPU_S3C2416
 
-config S3C2443_DMA
-       bool
-       help
-         Internal config node for S3C2443 DMA support
-
 config S3C2443_SETUP_SPI
        bool
        help