diff options
author | Olof Johansson <olof@lixom.net> | 2012-04-14 17:50:45 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-04-14 17:50:45 -0700 |
commit | 961a238c38a2716511dbd8e0f34d49dd46160007 (patch) | |
tree | 56a9ed1ae579ce0cc6453c9dc1202f99402df3fc /arch/arm/plat-samsung/Kconfig | |
parent | 47d9e44d1dbabc53500e86d5597f2737a40f1f42 (diff) | |
parent | 5ad14306a3f468df61e1739f9f252663f18f1702 (diff) | |
download | op-kernel-dev-961a238c38a2716511dbd8e0f34d49dd46160007.zip op-kernel-dev-961a238c38a2716511dbd8e0f34d49dd46160007.tar.gz |
Merge branch 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
ARM: EXYNOS: Remove broken config values for touchscren for NURI board
ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
ARM: EXYNOS: fix regulator name for NURI board
ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
ARM: EXYNOS: Add PDMA and MDMA physical base address defines
ARM: S5PV210: Fix compiler warning in dma.c file
ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
ARM: EXYNOS: Add missing definition for IRQ_I2S0
ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 71553f4..a0ffc77d 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -302,6 +302,7 @@ comment "Power management" config SAMSUNG_PM_DEBUG bool "S3C2410 PM Suspend debug" depends on PM + select DEBUG_LL help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> |