Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6-omap-h63xx.git] / arch / arm / plat-s3c24xx / Kconfig

diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 97813645b5ee3cc9413889e01b96f907b59709bf..b972f36d547ccd17190fd4cb698e1aa3e2656043 100644 (file)
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -7,10 +7,13 @@
 config PLAT_S3C24XX
        bool
        depends on ARCH_S3C2410
-       default y
+       default y if ARCH_S3C2410
+       select NO_IOPORT
        help
          Base platform code for any Samsung S3C device
 
+if PLAT_S3C24XX
+
 config CPU_S3C244X
        bool
        depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
@@ -55,6 +58,11 @@ config S3C2410_PM_CHECK
          going to sleep. The blocks are then checked on resume for any
          errors.
 
+         Note, this can take several seconds depending on memory size
+         and CPU speed.
+
+         See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
+
 config S3C2410_PM_CHECK_CHUNKSIZE
        int "S3C2410 PM Suspend CRC Chunksize (KiB)"
        depends on ARCH_S3C2410 && PM && S3C2410_PM_CHECK
@@ -65,6 +73,8 @@ config S3C2410_PM_CHECK_CHUNKSIZE
          the CRC data block will take more memory, but wil identify any
          faults with better precision.
 
+         See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
+
 config S3C2410_LOWLEVEL_UART_PORT
        int "S3C2410 UART to use for low-level messages"
        default 0
@@ -94,3 +104,4 @@ config MACH_SMDK
        help
          Common machine code for SMDK2410 and SMDK2440
 
+endif