diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 12:14:17 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 12:14:17 -0400 |
commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/mach-s5p64x0 | |
parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r-- | arch/arm/mach-s5p64x0/Kconfig | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig index c87f6108eeb1..e8742cb7ddd9 100644 --- a/arch/arm/mach-s5p64x0/Kconfig +++ b/arch/arm/mach-s5p64x0/Kconfig | |||
@@ -9,18 +9,18 @@ if ARCH_S5P64X0 | |||
9 | 9 | ||
10 | config CPU_S5P6440 | 10 | config CPU_S5P6440 |
11 | bool | 11 | bool |
12 | select SAMSUNG_DMADEV | ||
13 | select S5P_HRT | 12 | select S5P_HRT |
14 | select S5P_SLEEP if PM | 13 | select S5P_SLEEP if PM |
14 | select SAMSUNG_DMADEV | ||
15 | select SAMSUNG_WAKEMASK if PM | 15 | select SAMSUNG_WAKEMASK if PM |
16 | help | 16 | help |
17 | Enable S5P6440 CPU support | 17 | Enable S5P6440 CPU support |
18 | 18 | ||
19 | config CPU_S5P6450 | 19 | config CPU_S5P6450 |
20 | bool | 20 | bool |
21 | select SAMSUNG_DMADEV | ||
22 | select S5P_HRT | 21 | select S5P_HRT |
23 | select S5P_SLEEP if PM | 22 | select S5P_SLEEP if PM |
23 | select SAMSUNG_DMADEV | ||
24 | select SAMSUNG_WAKEMASK if PM | 24 | select SAMSUNG_WAKEMASK if PM |
25 | help | 25 | help |
26 | Enable S5P6450 CPU support | 26 | Enable S5P6450 CPU support |
@@ -52,19 +52,19 @@ config MACH_SMDK6440 | |||
52 | bool "SMDK6440" | 52 | bool "SMDK6440" |
53 | select CPU_S5P6440 | 53 | select CPU_S5P6440 |
54 | select S3C_DEV_FB | 54 | select S3C_DEV_FB |
55 | select S3C_DEV_I2C1 | ||
56 | select S3C_DEV_RTC | ||
57 | select S3C_DEV_WDT | ||
58 | select S3C_DEV_HSMMC | 55 | select S3C_DEV_HSMMC |
59 | select S3C_DEV_HSMMC1 | 56 | select S3C_DEV_HSMMC1 |
60 | select S3C_DEV_HSMMC2 | 57 | select S3C_DEV_HSMMC2 |
58 | select S3C_DEV_I2C1 | ||
59 | select S3C_DEV_RTC | ||
60 | select S3C_DEV_WDT | ||
61 | select S5P64X0_SETUP_FB_24BPP | ||
62 | select S5P64X0_SETUP_I2C1 | ||
63 | select S5P64X0_SETUP_SDHCI_GPIO | ||
61 | select SAMSUNG_DEV_ADC | 64 | select SAMSUNG_DEV_ADC |
62 | select SAMSUNG_DEV_BACKLIGHT | 65 | select SAMSUNG_DEV_BACKLIGHT |
63 | select SAMSUNG_DEV_PWM | 66 | select SAMSUNG_DEV_PWM |
64 | select SAMSUNG_DEV_TS | 67 | select SAMSUNG_DEV_TS |
65 | select S5P64X0_SETUP_FB_24BPP | ||
66 | select S5P64X0_SETUP_I2C1 | ||
67 | select S5P64X0_SETUP_SDHCI_GPIO | ||
68 | help | 68 | help |
69 | Machine support for the Samsung SMDK6440 | 69 | Machine support for the Samsung SMDK6440 |
70 | 70 | ||
@@ -72,19 +72,19 @@ config MACH_SMDK6450 | |||
72 | bool "SMDK6450" | 72 | bool "SMDK6450" |
73 | select CPU_S5P6450 | 73 | select CPU_S5P6450 |
74 | select S3C_DEV_FB | 74 | select S3C_DEV_FB |
75 | select S3C_DEV_I2C1 | ||
76 | select S3C_DEV_RTC | ||
77 | select S3C_DEV_WDT | ||
78 | select S3C_DEV_HSMMC | 75 | select S3C_DEV_HSMMC |
79 | select S3C_DEV_HSMMC1 | 76 | select S3C_DEV_HSMMC1 |
80 | select S3C_DEV_HSMMC2 | 77 | select S3C_DEV_HSMMC2 |
78 | select S3C_DEV_I2C1 | ||
79 | select S3C_DEV_RTC | ||
80 | select S3C_DEV_WDT | ||
81 | select S5P64X0_SETUP_FB_24BPP | ||
82 | select S5P64X0_SETUP_I2C1 | ||
83 | select S5P64X0_SETUP_SDHCI_GPIO | ||
81 | select SAMSUNG_DEV_ADC | 84 | select SAMSUNG_DEV_ADC |
82 | select SAMSUNG_DEV_BACKLIGHT | 85 | select SAMSUNG_DEV_BACKLIGHT |
83 | select SAMSUNG_DEV_PWM | 86 | select SAMSUNG_DEV_PWM |
84 | select SAMSUNG_DEV_TS | 87 | select SAMSUNG_DEV_TS |
85 | select S5P64X0_SETUP_FB_24BPP | ||
86 | select S5P64X0_SETUP_I2C1 | ||
87 | select S5P64X0_SETUP_SDHCI_GPIO | ||
88 | help | 88 | help |
89 | Machine support for the Samsung SMDK6450 | 89 | Machine support for the Samsung SMDK6450 |
90 | 90 | ||