diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
| commit | ef7994fa2aecd8d1fb0d75034caa050ff908d26a (patch) | |
| tree | aa7bbe9499256ced149dce70891de5eedf33c283 /arch/arm/mach-s5p64x0/Kconfig | |
| parent | ad8686bc05adc2b8301d749f5958bd904f3a46ee (diff) | |
| parent | a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff) | |
Merge 3.16-rc2 into staging-next
We want the staging fixes here as well.
Diffstat (limited to 'arch/arm/mach-s5p64x0/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5p64x0/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig index bb2111b3751e..26003e23796d 100644 --- a/arch/arm/mach-s5p64x0/Kconfig +++ b/arch/arm/mach-s5p64x0/Kconfig | |||
| @@ -9,16 +9,18 @@ if ARCH_S5P64X0 | |||
| 9 | 9 | ||
| 10 | config CPU_S5P6440 | 10 | config CPU_S5P6440 |
| 11 | bool | 11 | bool |
| 12 | select ARM_AMBA | ||
| 13 | select PL330_DMA if DMADEVICES | ||
| 12 | select S5P_SLEEP if PM | 14 | select S5P_SLEEP if PM |
| 13 | select SAMSUNG_DMADEV | ||
| 14 | select SAMSUNG_WAKEMASK if PM | 15 | select SAMSUNG_WAKEMASK if PM |
| 15 | help | 16 | help |
| 16 | Enable S5P6440 CPU support | 17 | Enable S5P6440 CPU support |
| 17 | 18 | ||
| 18 | config CPU_S5P6450 | 19 | config CPU_S5P6450 |
| 19 | bool | 20 | bool |
| 21 | select ARM_AMBA | ||
| 22 | select PL330_DMA if DMADEVICES | ||
| 20 | select S5P_SLEEP if PM | 23 | select S5P_SLEEP if PM |
| 21 | select SAMSUNG_DMADEV | ||
| 22 | select SAMSUNG_WAKEMASK if PM | 24 | select SAMSUNG_WAKEMASK if PM |
| 23 | help | 25 | help |
| 24 | Enable S5P6450 CPU support | 26 | Enable S5P6450 CPU support |