diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-10-16 07:55:51 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-10-29 19:21:28 -0400 |
| commit | e33ffd4d28a2d516e32126ebabf4d9e930254cf5 (patch) | |
| tree | 45751151076bfb9291d48abbc63c069853d3520f | |
| parent | b18cae4224bde7e5a332c19bc99247b2098ea232 (diff) | |
ARM: S3C2440: various fixes in Kconfig file
* kconfig symbols defined in arch/arm/mach-s3c2440/Kconfig are only available
when ARCH_S3C2410 is selected, so no need to make some of them depend
on ARCH_S3C2410.
* fix CPU_S3C24405B typo in "config S3C2440_DMA".
* mini2440: remove unconditionally select of SND_S3C24XX_SOC_S3C24XX_UDA134X.
Those fixes avoid the following warnings at make time:
scripts/kconfig/qconf arch/arm/Kconfig
warning: (MACH_MINI2440 && ARCH_S3C2410) selects SND_S3C24XX_SOC_S3C24XX_UDA134X
which has unmet direct dependencies (SND_S3C24XX_SOC && ARCH_S3C2410)
warning: (CPU_S3C2440 && ARCH_S3C2410 && S3C2410_DMA) selects S3C2440_DMA which
has unmet direct dependencies (ARCH_S3C2410 && CPU_S3C24405B)
warning: (CPU_S3C2440 && ARCH_S3C2410 || CPU_S3C2442 && ARCH_S3C2410)
selects CPU_S3C244X which has unmet direct dependencies (!ARCH_S3C2410)
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index cd8e7de388f0..ff024a6c0f85 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | config CPU_S3C2440 | 5 | config CPU_S3C2440 |
| 6 | bool | 6 | bool |
| 7 | depends on ARCH_S3C2410 | ||
| 8 | select CPU_ARM920T | 7 | select CPU_ARM920T |
| 9 | select S3C_GPIO_PULL_UP | 8 | select S3C_GPIO_PULL_UP |
| 10 | select S3C2410_CLOCK | 9 | select S3C2410_CLOCK |
| @@ -18,7 +17,6 @@ config CPU_S3C2440 | |||
| 18 | 17 | ||
| 19 | config CPU_S3C2442 | 18 | config CPU_S3C2442 |
| 20 | bool | 19 | bool |
| 21 | depends on ARCH_S3C2410 | ||
| 22 | select CPU_ARM920T | 20 | select CPU_ARM920T |
| 23 | select S3C2410_CLOCK | 21 | select S3C2410_CLOCK |
| 24 | select S3C2410_GPIO | 22 | select S3C2410_GPIO |
| @@ -30,7 +28,7 @@ config CPU_S3C2442 | |||
| 30 | 28 | ||
| 31 | config CPU_S3C244X | 29 | config CPU_S3C244X |
| 32 | bool | 30 | bool |
| 33 | depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) | 31 | depends on CPU_S3C2440 || CPU_S3C2442 |
| 34 | help | 32 | help |
| 35 | Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. | 33 | Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. |
| 36 | 34 | ||
| @@ -72,7 +70,7 @@ config S3C2440_PLL_16934400 | |||
| 72 | 70 | ||
| 73 | config S3C2440_DMA | 71 | config S3C2440_DMA |
| 74 | bool | 72 | bool |
| 75 | depends on ARCH_S3C2410 && CPU_S3C24405B | 73 | depends on CPU_S3C2440 |
| 76 | help | 74 | help |
| 77 | Support for S3C2440 specific DMA code5A | 75 | Support for S3C2440 specific DMA code5A |
| 78 | 76 | ||
| @@ -181,7 +179,6 @@ config MACH_MINI2440 | |||
| 181 | select CPU_S3C2440 | 179 | select CPU_S3C2440 |
| 182 | select EEPROM_AT24 | 180 | select EEPROM_AT24 |
| 183 | select LEDS_TRIGGER_BACKLIGHT | 181 | select LEDS_TRIGGER_BACKLIGHT |
| 184 | select SND_S3C24XX_SOC_S3C24XX_UDA134X | ||
| 185 | select S3C_DEV_NAND | 182 | select S3C_DEV_NAND |
| 186 | select S3C_DEV_USB_HOST | 183 | select S3C_DEV_USB_HOST |
| 187 | help | 184 | help |